Merge branch 'develop' into 1166_make_cancel_forceful

152 files changed, 5816 insertions, 1830 deletions

diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py
index 741db54f..8ba0aac2 100644
--- a/cli/onionshare_cli/__init__.py
+++ b/cli/onionshare_cli/__init__.py
@@ -180,11 +180,11 @@ def main(cwd=None):
     )
     # Share args
     parser.add_argument(
-        "--autostop-sharing",
+        "--no-autostop-sharing",
         action="store_true",
-        dest="autostop_sharing",
-        default=True,
-        help="Share files: Stop sharing after files have been sent",
+        dest="no_autostop_sharing",
+        default=False,
+        help="Share files: Continue sharing after files have been sent (default is to stop sharing)",
     )
     # Receive args
     parser.add_argument(
@@ -233,7 +233,7 @@ def main(cwd=None):
     autostop_timer = int(args.autostop_timer)
     legacy = bool(args.legacy)
     client_auth = bool(args.client_auth)
-    autostop_sharing = bool(args.autostop_sharing)
+    autostop_sharing = not bool(args.no_autostop_sharing)
     data_dir = args.data_dir
     disable_csp = bool(args.disable_csp)
     verbose = bool(args.verbose)
@@ -361,7 +361,7 @@ def main(cwd=None):
                 )
                 sys.exit()
 
-            app.start_onion_service(mode_settings, False, True)
+            app.start_onion_service(mode, mode_settings, False, True)
             url = build_url(mode_settings, app, web)
             schedule = datetime.now() + timedelta(seconds=autostart_timer)
             if mode == "receive":
@@ -397,9 +397,9 @@ def main(cwd=None):
             print("Waiting for the scheduled time before starting...")
             app.onion.cleanup(False)
             time.sleep(autostart_timer)
-            app.start_onion_service(mode_settings)
+            app.start_onion_service(mode, mode_settings)
         else:
-            app.start_onion_service(mode_settings)
+            app.start_onion_service(mode, mode_settings)
     except KeyboardInterrupt:
         print("")
         sys.exit()
diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py
index aa057b12..7c9d0a67 100644
--- a/cli/onionshare_cli/onion.py
+++ b/cli/onionshare_cli/onion.py
@@ -169,6 +169,9 @@ class Onion(object):
         # Assigned later if we are using stealth mode
         self.auth_string = None
 
+        # Keep track of onions where it's important to gracefully close to prevent truncated downloads
+        self.graceful_close_onions = []
+
     def connect(
         self,
         custom_settings=None,
@@ -600,7 +603,7 @@ class Onion(object):
         else:
             return False
 
-    def start_onion_service(self, mode_settings, port, await_publication):
+    def start_onion_service(self, mode, mode_settings, port, await_publication):
         """
         Start a onion service on port 80, pointing to the given port, and
         return the onion hostname.
@@ -678,6 +681,10 @@ class Onion(object):
 
         onion_host = res.service_id + ".onion"
 
+        # Gracefully close share mode rendezvous circuits
+        if mode == "share":
+            self.graceful_close_onions.append(res.service_id)
+
         # Save the service_id
         mode_settings.set("general", "service_id", res.service_id)
 
@@ -709,7 +716,7 @@ class Onion(object):
                     "Onion", "stop_onion_service", f"failed to remove {onion_host}"
                 )
 
-    def cleanup(self, stop_tor=True):
+    def cleanup(self, stop_tor=True, wait=True):
         """
         Stop onion services that were created earlier. If there's a tor subprocess running, kill it.
         """
@@ -736,6 +743,46 @@ class Onion(object):
         if stop_tor:
             # Stop tor process
             if self.tor_proc:
+                if wait:
+                    # Wait for Tor rendezvous circuits to close
+                    # Catch exceptions to prevent crash on Ctrl-C
+                    try:
+                        rendevouz_circuit_ids = []
+                        for c in self.c.get_circuits():
+                            if (
+                                c.purpose == "HS_SERVICE_REND"
+                                and c.rend_query in self.graceful_close_onions
+                            ):
+                                rendevouz_circuit_ids.append(c.id)
+
+                        symbols = [c for c in "\\|/-"]
+                        symbols_i = 0
+
+                        while True:
+                            num_rend_circuits = 0
+                            for c in self.c.get_circuits():
+                                if c.id in rendevouz_circuit_ids:
+                                    num_rend_circuits += 1
+
+                            if num_rend_circuits == 0:
+                                print(
+                                    "\rTor rendezvous circuits have closed" + " " * 20
+                                )
+                                break
+
+                            if num_rend_circuits == 1:
+                                circuits = "circuit"
+                            else:
+                                circuits = "circuits"
+                            print(
+                                f"\rWaiting for {num_rend_circuits} Tor rendezvous {circuits} to close {symbols[symbols_i]} ",
+                                end="",
+                            )
+                            symbols_i = (symbols_i + 1) % len(symbols)
+                            time.sleep(1)
+                    except:
+                        pass
+
                 self.tor_proc.terminate()
                 time.sleep(0.2)
                 if self.tor_proc.poll() is None:
diff --git a/cli/onionshare_cli/onionshare.py b/cli/onionshare_cli/onionshare.py
index 513dbc34..db15a03d 100644
--- a/cli/onionshare_cli/onionshare.py
+++ b/cli/onionshare_cli/onionshare.py
@@ -62,7 +62,7 @@ class OnionShare(object):
         except:
             raise OSError("Cannot find an available OnionShare port")
 
-    def start_onion_service(self, mode_settings, await_publication=True):
+    def start_onion_service(self, mode, mode_settings, await_publication=True):
         """
         Start the onionshare onion service.
         """
@@ -79,7 +79,7 @@ class OnionShare(object):
             return
 
         self.onion_host = self.onion.start_onion_service(
-            mode_settings, self.port, await_publication
+            mode, mode_settings, self.port, await_publication
         )
 
         if mode_settings.get("general", "client_auth"):
diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py
index 87f35eaa..576cc851 100644
--- a/cli/onionshare_cli/web/share_mode.py
+++ b/cli/onionshare_cli/web/share_mode.py
@@ -292,12 +292,8 @@ class ShareModeWeb(SendBaseModeWeb):
                 info["size"] = self.common.dir_size(filename)
                 info["size_human"] = self.common.human_readable_filesize(info["size"])
                 self.file_info["dirs"].append(info)
-        self.file_info["files"] = sorted(
-            self.file_info["files"], key=lambda k: k["basename"]
-        )
-        self.file_info["dirs"] = sorted(
-            self.file_info["dirs"], key=lambda k: k["basename"]
-        )
+        self.file_info["files"].sort(key=lambda k: k["basename"])
+        self.file_info["dirs"].sort(key=lambda k: k["basename"])
 
         # Check if there's only 1 file and no folders
         if len(self.file_info["files"]) == 1 and len(self.file_info["dirs"]) == 0:
diff --git a/cli/tests/test_cli.py b/cli/tests/test_cli.py
index 99f26547..be71240b 100644
--- a/cli/tests/test_cli.py
+++ b/cli/tests/test_cli.py
@@ -15,7 +15,7 @@ class MyOnion:
 
     @staticmethod
     def start_onion_service(
-        self, mode_settings_obj, await_publication=True, save_scheduled_key=False
+        self, mode, mode_settings_obj, await_publication=True, save_scheduled_key=False
     ):
         return "test_service_id.onion"
 
@@ -40,13 +40,13 @@ class TestOnionShare:
         assert onionshare_obj.local_only is False
 
     def test_start_onion_service(self, onionshare_obj, mode_settings_obj):
-        onionshare_obj.start_onion_service(mode_settings_obj)
+        onionshare_obj.start_onion_service("share", mode_settings_obj)
         assert 17600 <= onionshare_obj.port <= 17650
         assert onionshare_obj.onion_host == "test_service_id.onion"
 
     def test_start_onion_service_local_only(self, onionshare_obj, mode_settings_obj):
         onionshare_obj.local_only = True
-        onionshare_obj.start_onion_service(mode_settings_obj)
+        onionshare_obj.start_onion_service("share", mode_settings_obj)
         assert onionshare_obj.onion_host == "127.0.0.1:{}".format(onionshare_obj.port)
 
     def test_cleanup(self, onionshare_obj, temp_dir_1024, temp_file_1024):
diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py
index 287d882c..f66c5a28 100644
--- a/desktop/src/onionshare/__init__.py
+++ b/desktop/src/onionshare/__init__.py
@@ -64,6 +64,10 @@ def main():
     """
     common = Common()
 
+    # Required for macOS Big Sur: https://stackoverflow.com/a/64878899
+    if common.platform == "Darwin":
+        os.environ["QT_MAC_WANTS_LAYER"] = "1"
+
     # Display OnionShare banner
     print(f"OnionShare {common.version} | https://onionshare.org/")
 
diff --git a/desktop/src/onionshare/main_window.py b/desktop/src/onionshare/main_window.py
index c1e0cd1a..a1b44032 100644
--- a/desktop/src/onionshare/main_window.py
+++ b/desktop/src/onionshare/main_window.py
@@ -30,6 +30,7 @@ from .widgets import Alert
 from .update_checker import UpdateThread
 from .tab_widget import TabWidget
 from .gui_common import GuiCommon
+from .threads import OnionCleanupThread
 
 
 class MainWindow(QtWidgets.QMainWindow):
@@ -285,8 +286,32 @@ class MainWindow(QtWidgets.QMainWindow):
         e.accept()
 
     def cleanup(self):
+        self.common.log("MainWindow", "cleanup")
         self.tabs.cleanup()
-        self.common.gui.onion.cleanup()
+
+        alert = Alert(
+            self.common,
+            strings._("gui_rendezvous_cleanup"),
+            QtWidgets.QMessageBox.Information,
+            buttons=QtWidgets.QMessageBox.NoButton,
+            autostart=False,
+        )
+        quit_early_button = QtWidgets.QPushButton(
+            strings._("gui_rendezvous_cleanup_quit_early")
+        )
+        alert.addButton(quit_early_button, QtWidgets.QMessageBox.RejectRole)
+
+        self.onion_cleanup_thread = OnionCleanupThread(self.common)
+        self.onion_cleanup_thread.finished.connect(alert.accept)
+        self.onion_cleanup_thread.start()
+
+        alert.exec_()
+        if alert.clickedButton() == quit_early_button:
+            self.common.log("MainWindow", "cleanup", "quitting early")
+            if self.onion_cleanup_thread.isRunning():
+                self.onion_cleanup_thread.terminate()
+                self.onion_cleanup_thread.wait()
+            self.common.gui.onion.cleanup(wait=False)
 
         # Wait 1 second for threads to close gracefully, so tests finally pass
         time.sleep(1)
diff --git a/desktop/src/onionshare/resources/locale/ca.json b/desktop/src/onionshare/resources/locale/ca.json
index 4edcc392..0015a5ba 100644
--- a/desktop/src/onionshare/resources/locale/ca.json
+++ b/desktop/src/onionshare/resources/locale/ca.json
@@ -107,7 +107,7 @@
     "gui_settings_autostop_timer_checkbox": "Utilitza un temporitzador d'aturada",
     "gui_settings_autostop_timer": "Atura a:",
     "settings_error_unknown": "No s'ha pogut connectar a Tor perquè la configuració és inconsistent.",
-    "settings_error_automatic": "No s'ha pogut connectar al controlador de Tor. Heu iniciat el Tor Browser? (disponible a torproject.org)",
+    "settings_error_automatic": "No s'ha pogut connectar al controlador de Tor. Heu iniciat el navegador Tor? (disponible a torproject.org)",
     "settings_error_socket_port": "No s'ha pogut establir la connexió al controlador de Tor a {}:{}.",
     "settings_error_socket_file": "No s'ha pogut connectar al controlador de Tor fent servir el fitxer de socket {}.",
     "settings_error_auth": "S'ha establert la connexió a {}:{} però ha fallat l'autenticació. Pot ser que no sigui un controlador de Tor?",
@@ -131,7 +131,7 @@
     "gui_tor_connection_error_settings": "Proveu de canviar la configuració de com OnionShare es connecta a la xarxa Tor.",
     "gui_tor_connection_canceled": "No s'ha pogut establir la connexió amb la xarxa Tor.\n\nAssegureu-vos que teniu connexió a internet, torneu a obrir l'OnionShare i prepareu la connexió a Tor.",
     "gui_tor_connection_lost": "S'ha perdut la connexió amb Tor.",
-    "gui_server_started_after_autostop_timer": "El temporitzador de finalització automàtica ha acabat abans que s'iniciés el servidor.\nTorneu a compartir-ho.",
+    "gui_server_started_after_autostop_timer": "El temporitzador de finalització automàtica ha acabat abans que s'iniciés el servidor. Torneu a compartir-ho.",
     "gui_server_autostop_timer_expired": "El temporitzador de finalització automàtica ja s'ha acabat. Ajusteu-lo per a poder compartir.",
     "share_via_onionshare": "Comparteix-ho amb l'OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Fes servir adreces amb un format antic",
@@ -280,5 +280,17 @@
     "gui_chat_stop_server": "Atura el servidor de xat",
     "gui_chat_start_server": "Inicia el servidor de xat",
     "gui_file_selection_remove_all": "Treu-ho tot",
-    "gui_remove": "Treu"
+    "gui_remove": "Treu",
+    "error_port_not_available": "El port OnionShare no és disponible",
+    "gui_tab_name_chat": "Xat",
+    "gui_tab_name_website": "Lloc web",
+    "gui_tab_name_receive": "Rep",
+    "gui_tab_name_share": "Comparteix",
+    "gui_main_page_chat_button": "Comença el xat",
+    "gui_main_page_website_button": "Comença l'allotjatment",
+    "gui_main_page_receive_button": "Comença la recepció",
+    "gui_main_page_share_button": "Comença la compartició",
+    "gui_new_tab_chat_button": "Xat anònim",
+    "gui_open_folder_error": "No s'ha pogut obrir la carpeta amb xdg-open. El fitxer és aquí: {}",
+    "gui_chat_url_description": "<b>Qualsevol persona</b> amb aquesta adreça OnionShare pot <b>unir-se a aquesta sala de xat</b> fent servir el <b>navegador Tor</b>: <img src='{}' />"
 }
diff --git a/desktop/src/onionshare/resources/locale/da.json b/desktop/src/onionshare/resources/locale/da.json
index 8eea6c7f..e4da77bc 100644
--- a/desktop/src/onionshare/resources/locale/da.json
+++ b/desktop/src/onionshare/resources/locale/da.json
@@ -287,5 +287,7 @@
     "gui_main_page_share_button": "Begynd at dele",
     "gui_main_page_receive_button": "Begynd at modtage",
     "gui_main_page_website_button": "Begynd at være vært",
-    "gui_main_page_chat_button": "Begynd at chatte"
+    "gui_main_page_chat_button": "Begynd at chatte",
+    "gui_chat_url_description": "<b>Alle</b> med denne OnionShare-adresse kan <b>deltage i chatrummet</b> med <b>Tor Browser</b>: <img src='{}' />",
+    "error_port_not_available": "OnionShare-port ikke tilgængelig"
 }
diff --git a/desktop/src/onionshare/resources/locale/de.json b/desktop/src/onionshare/resources/locale/de.json
index 0ffed7dc..25db240e 100644
--- a/desktop/src/onionshare/resources/locale/de.json
+++ b/desktop/src/onionshare/resources/locale/de.json
@@ -291,5 +291,6 @@
     "gui_open_folder_error": "Fehler beim Öffnen des Ordners mit xdg-open. Die Datei befindet sich hier: {}",
     "gui_qr_code_description": "Scanne diesen QR-Code mit einem QR-Scanner, wie zB. mit der Kamera deines Smartphones, um die OnionShare-Adresse einfacher mit anderen zu teilen.",
     "gui_receive_flatpak_data_dir": "Da OnionShare durch Flatpak installiert wurde, müssen Dateien im Verzeichnis ~/OnionShare gespeichert werden.",
-    "gui_chat_url_description": "<b>Jeder</b>, der diese OnionShare-Adresse hat, kann <b>diesem Chatroom beitreten</b>, indem er den <b>Tor Browser</b> benutzt: <img src='{}' />"
+    "gui_chat_url_description": "<b>Jeder</b>, der diese OnionShare-Adresse hat, kann <b>diesem Chatroom beitreten</b>, indem er den <b>Tor Browser</b> benutzt: <img src='{}' />",
+    "error_port_not_available": "OnionShare-Port nicht verfügbar"
 }
diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json
index 9617e9c4..502fe13e 100644
--- a/desktop/src/onionshare/resources/locale/en.json
+++ b/desktop/src/onionshare/resources/locale/en.json
@@ -188,5 +188,7 @@
     "settings_error_bundled_tor_not_supported": "Using the Tor version that comes with OnionShare does not work in developer mode on Windows or macOS.",
     "settings_error_bundled_tor_timeout": "Taking too long to connect to Tor. Maybe you aren't connected to the Internet, or have an inaccurate system clock?",
     "settings_error_bundled_tor_broken": "OnionShare could not connect to Tor:\n{}",
+    "gui_rendezvous_cleanup": "Waiting for Tor circuits to close to be sure your files have successfully transferred.\n\nThis might take a few minutes.",
+    "gui_rendezvous_cleanup_quit_early": "Quit Early",
     "error_port_not_available": "OnionShare port not available"
 }
\ No newline at end of file
diff --git a/desktop/src/onionshare/resources/locale/es.json b/desktop/src/onionshare/resources/locale/es.json
index f93333c4..0035f9c5 100644
--- a/desktop/src/onionshare/resources/locale/es.json
+++ b/desktop/src/onionshare/resources/locale/es.json
@@ -296,5 +296,6 @@
     "gui_main_page_website_button": "Empezar a alojar",
     "gui_main_page_receive_button": "Empezar a recibir",
     "gui_main_page_share_button": "Empezar a compartir",
-    "gui_chat_url_description": "<b>Cualquiera</b> con esta dirección de OnionShare puede <b>puede unirse a este cuarto de chat</b> usando el <b>Navegador Tor</b>: <img src='{}' />"
+    "gui_chat_url_description": "<b>Cualquiera</b> con esta dirección de OnionShare puede <b>puede unirse a este cuarto de chat</b> usando el <b>Navegador Tor</b>: <img src='{}' />",
+    "error_port_not_available": "Puerto OnionShare no disponible"
 }
diff --git a/desktop/src/onionshare/resources/locale/gl.json b/desktop/src/onionshare/resources/locale/gl.json
index 6d074949..3a5558f9 100644
--- a/desktop/src/onionshare/resources/locale/gl.json
+++ b/desktop/src/onionshare/resources/locale/gl.json
@@ -187,5 +187,6 @@
     "settings_error_unreadable_cookie_file": "Conectado ó controlador Tor, pero o contrasinal igual está mal, ou o teu usuario non ten permiso para ler o ficheiro de cookie.",
     "settings_error_bundled_tor_not_supported": "A versión Tor que ven con OnionShare non funciona en modo desenvolvedor en Windows ou macOS.",
     "settings_error_bundled_tor_timeout": "Tarda demasiado en conectar a Tor. Igual non tes conexión a Internet, ou o reloxo do sistema está mal axustado?",
-    "settings_error_bundled_tor_broken": "OnionShare non puido conectar a Tor:\n{}"
+    "settings_error_bundled_tor_broken": "OnionShare non puido conectar a Tor:\n{}",
+    "error_port_not_available": "Non está dispoñible o porto OnionShare"
 }
diff --git a/desktop/src/onionshare/resources/locale/hr.json b/desktop/src/onionshare/resources/locale/hr.json
index 6c40fdfd..d7670121 100644
--- a/desktop/src/onionshare/resources/locale/hr.json
+++ b/desktop/src/onionshare/resources/locale/hr.json
@@ -229,5 +229,6 @@
     "gui_main_page_website_button": "Pokreni hosting",
     "gui_main_page_receive_button": "Pokreni primanje",
     "gui_main_page_share_button": "Pokreni dijeljenje",
-    "gui_chat_url_description": "<b>Svatko</b> s ovom OnionShare adresom može se <b>pridružiti sobi za chat</b> koristeći <b>Tor preglednik</b>: <img src='{}' />"
+    "gui_chat_url_description": "<b>Svatko</b> s ovom OnionShare adresom može se <b>pridružiti sobi za chat</b> koristeći <b>Tor preglednik</b>: <img src='{}' />",
+    "error_port_not_available": "OnionShare priključak nije dostupan"
 }
diff --git a/desktop/src/onionshare/resources/locale/pt_BR.json b/desktop/src/onionshare/resources/locale/pt_BR.json
index b321ba7f..f4916351 100644
--- a/desktop/src/onionshare/resources/locale/pt_BR.json
+++ b/desktop/src/onionshare/resources/locale/pt_BR.json
@@ -131,7 +131,7 @@
     "gui_tor_connection_error_settings": "Tente mudar nas configurações a forma como OnionShare se conecta à rede Tor.",
     "gui_tor_connection_canceled": "Não foi possível conectar ao Tor.\n\nTenha certeza que você está conectado à Internet, então abra OnionShare novamente e configure sua conexão ao Tor.",
     "gui_tor_connection_lost": "Desconectado do Tor.",
-    "gui_server_started_after_autostop_timer": "O tempo esgotou antes do servidor iniciar.\nPor favor, crie um novo compartilhamento.",
+    "gui_server_started_after_autostop_timer": "O cronômetro de parada automática acabou antes que o servidor fosse iniciado. Por favor, faça um novo compartilhamento.",
     "gui_server_autostop_timer_expired": "O cronômetro já esgotou. Por favor, ajuste-o para começar a compartilhar.",
     "share_via_onionshare": "Compartilhar via OnionShare",
     "gui_use_legacy_v2_onions_checkbox": "Usar endereços do tipo antigo",
@@ -282,5 +282,7 @@
     "gui_chat_start_server": "Iniciar um servidor de conversas",
     "gui_file_selection_remove_all": "Remover tudo",
     "gui_remove": "Remover",
-    "gui_tab_name_chat": "Bate-papo"
+    "gui_tab_name_chat": "Bate-papo",
+    "error_port_not_available": "Porta OnionShare não disponível",
+    "gui_chat_url_description": "<b>Qualquer um</b> com este endereço OnionShare pode <b>entrar nesta sala de chat</b> usando o <b>Tor Browser</b>: <img src='{}' />"
 }
diff --git a/desktop/src/onionshare/resources/locale/tr.json b/desktop/src/onionshare/resources/locale/tr.json
index 1fae24b1..c5663e48 100644
--- a/desktop/src/onionshare/resources/locale/tr.json
+++ b/desktop/src/onionshare/resources/locale/tr.json
@@ -254,5 +254,6 @@
     "gui_tab_name_receive": "Al",
     "gui_tab_name_website": "Web Sitesi",
     "gui_tab_name_chat": "Sohbet",
-    "gui_chat_url_description": "Bu OnionShare adresine sahip olan <b>herkes</b> <b>Tor Browser</b> kullanarak <b>bu sohbet odasına katılabilir</b>: <img src='{}' />"
+    "gui_chat_url_description": "Bu OnionShare adresine sahip olan <b>herkes</b> <b>Tor Browser</b> kullanarak <b>bu sohbet odasına katılabilir</b>: <img src='{}' />",
+    "error_port_not_available": "OnionShare bağlantı noktası kullanılamıyor"
 }
diff --git a/desktop/src/onionshare/resources/locale/uk.json b/desktop/src/onionshare/resources/locale/uk.json
index bb16daaf..528c19c1 100644
--- a/desktop/src/onionshare/resources/locale/uk.json
+++ b/desktop/src/onionshare/resources/locale/uk.json
@@ -229,5 +229,6 @@
     "gui_main_page_chat_button": "Почати спілкуватися в чаті",
     "gui_main_page_website_button": "Почати хостинг",
     "gui_main_page_receive_button": "Почати отримання",
-    "gui_chat_url_description": "<b>Будь-хто</b> за цією адресою OnionShare може <b>приєднатися до цієї бесіди</b> за допомогою <b>Tor Browser</b>: <img src='{}' />"
+    "gui_chat_url_description": "<b>Будь-хто</b> за цією адресою OnionShare може <b>приєднатися до цієї бесіди</b> за допомогою <b>Tor Browser</b>: <img src='{}' />",
+    "error_port_not_available": "Порт OnionShare недоступний"
 }
diff --git a/desktop/src/onionshare/resources/locale/zh_Hans.json b/desktop/src/onionshare/resources/locale/zh_Hans.json
index 497e42df..6ba6607c 100644
--- a/desktop/src/onionshare/resources/locale/zh_Hans.json
+++ b/desktop/src/onionshare/resources/locale/zh_Hans.json
@@ -31,7 +31,7 @@
     "help_verbose": "将OnionShare错误日志记录到stdout，将web错误日志记录到磁盘",
     "help_filename": "要分享的文件或文件夹的列表",
     "help_config": "自定义JSON配置文件的路径(可选)",
-    "gui_drag_and_drop": "拖动文件或文件夹\n以开始共享",
+    "gui_drag_and_drop": "拖放文件和文件夹以开始共享",
     "gui_add": "添加",
     "gui_delete": "删除",
     "gui_choose_items": "选取",
@@ -243,7 +243,7 @@
     "mode_settings_autostop_timer_checkbox": "定时停止onion服务",
     "mode_settings_autostart_timer_checkbox": "定时起动onion服务",
     "mode_settings_public_checkbox": "不使用密码",
-    "mode_settings_persistent_checkbox": "保存此标签，并在打开OnionShare时自动打开它。",
+    "mode_settings_persistent_checkbox": "保存此标签，并在我打开OnionShare时自动打开它",
     "mode_settings_advanced_toggle_hide": "隐藏高级选项",
     "mode_settings_advanced_toggle_show": "显示高级选项",
     "gui_quit_warning_cancel": "取消",
@@ -270,5 +270,17 @@
     "gui_chat_start_server": "开始言论服务器",
     "gui_file_selection_remove_all": "删除所有",
     "gui_remove": "删除",
-    "gui_qr_code_dialog_title": "Onionshare 二维码"
+    "gui_qr_code_dialog_title": "Onionshare 二维码",
+    "error_port_not_available": "OnionShare端口不可用",
+    "gui_tab_name_chat": "聊天",
+    "gui_tab_name_website": "网站",
+    "gui_tab_name_receive": "接收",
+    "gui_tab_name_share": "分享",
+    "gui_main_page_chat_button": "开始聊天",
+    "gui_main_page_website_button": "开始托管",
+    "gui_main_page_receive_button": "开始接收",
+    "gui_main_page_share_button": "开始分享",
+    "gui_new_tab_chat_button": "匿名聊天",
+    "gui_open_folder_error": "用xdg-open打开文件夹失败。文件在这里: {}",
+    "gui_chat_url_description": "<b>任何</b>有这个OnionShare地址的人均可 <b>加入这个聊天室</b>，方法是使用<b>Tor浏览器</b>:<img src='{}' />"
 }
diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py
index 7d2159c7..c48f20c0 100644
--- a/desktop/src/onionshare/tab/mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/__init__.py
@@ -107,6 +107,12 @@ class Mode(QtWidgets.QWidget):
         """
         pass
 
+    def get_type(self):
+        """
+        Returns the type of mode as a string (e.g. "share", "receive", etc.)
+        """
+        pass
+
     def human_friendly_time(self, secs):
         """
         Returns a human-friendly time delta from given seconds.
diff --git a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
index 25a02969..a7c2929b 100644
--- a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py
@@ -101,6 +101,12 @@ class ChatMode(Mode):
         self.wrapper_layout.addLayout(self.column_layout)
         self.setLayout(self.wrapper_layout)
 
+    def get_type(self):
+        """
+        Returns the type of mode as a string (e.g. "share", "receive", etc.)
+        """
+        return "chat"
+
     def get_stop_server_autostop_timer_text(self):
         """
         Return the string to put on the stop server button, if there's an auto-stop timer
diff --git a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
index 95d1ecbe..95a68dcb 100644
--- a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py
@@ -149,6 +149,12 @@ class ReceiveMode(Mode):
         self.wrapper_layout.addLayout(self.column_layout)
         self.setLayout(self.wrapper_layout)
 
+    def get_type(self):
+        """
+        Returns the type of mode as a string (e.g. "share", "receive", etc.)
+        """
+        return "receive"
+
     def data_dir_button_clicked(self):
         """
         Browse for a new OnionShare data directory, and save to tab settings
diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
index ccf85dbd..bf1498d5 100644
--- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py
@@ -173,6 +173,12 @@ class ShareMode(Mode):
         # Always start with focus on file selection
         self.file_selection.setFocus()
 
+    def get_type(self):
+        """
+        Returns the type of mode as a string (e.g. "share", "receive", etc.)
+        """
+        return "share"
+
     def autostop_sharing_checkbox_clicked(self):
         """
         Save autostop sharing setting to the tab settings
diff --git a/desktop/src/onionshare/tab/mode/website_mode/__init__.py b/desktop/src/onionshare/tab/mode/website_mode/__init__.py
index 325b22f1..6df6ff02 100644
--- a/desktop/src/onionshare/tab/mode/website_mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/website_mode/__init__.py
@@ -173,6 +173,12 @@ class WebsiteMode(Mode):
         # Always start with focus on file selection
         self.file_selection.setFocus()
 
+    def get_type(self):
+        """
+        Returns the type of mode as a string (e.g. "share", "receive", etc.)
+        """
+        return "website"
+
     def disable_csp_checkbox_clicked(self):
         """
         Save disable CSP setting to the tab settings
diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py
index 8f5ffd08..8cbddfed 100644
--- a/desktop/src/onionshare/tab/tab.py
+++ b/desktop/src/onionshare/tab/tab.py
@@ -669,7 +669,9 @@ class Tab(QtWidgets.QWidget):
             return False
 
     def cleanup(self):
+        self.common.log("Tab", "cleanup", f"tab_id={self.tab_id}")
         if self.get_mode() and self.get_mode().web_thread:
+            self.get_mode().web.stop(self.get_mode().app.port)
             self.get_mode().web_thread.quit()
             self.get_mode().web_thread.wait()
         self.app.cleanup()
diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py
index 84d16e83..b78e67dd 100644
--- a/desktop/src/onionshare/tab_widget.py
+++ b/desktop/src/onionshare/tab_widget.py
@@ -81,6 +81,8 @@ class TabWidget(QtWidgets.QTabWidget):
         self.event_handler_t.start()
 
     def cleanup(self):
+        self.common.log("TabWidget", "cleanup")
+
         # Stop the event thread
         self.event_handler_t.should_quit = True
         self.event_handler_t.quit()
diff --git a/desktop/src/onionshare/threads.py b/desktop/src/onionshare/threads.py
index 285b51b9..0c31a838 100644
--- a/desktop/src/onionshare/threads.py
+++ b/desktop/src/onionshare/threads.py
@@ -77,7 +77,7 @@ class OnionThread(QtCore.QThread):
         try:
             if self.mode.obtain_onion_early:
                 self.mode.app.start_onion_service(
-                    self.mode.settings, await_publication=False
+                    self.mode.get_type(), self.mode.settings, await_publication=False
                 )
                 # wait for modules in thread to load, preventing a thread-related cx_Freeze crash
                 time.sleep(0.2)
@@ -86,7 +86,7 @@ class OnionThread(QtCore.QThread):
                 self.mode.app.stop_onion_service(self.mode.settings)
             else:
                 self.mode.app.start_onion_service(
-                    self.mode.settings, await_publication=True
+                    self.mode.get_type(), self.mode.settings, await_publication=True
                 )
                 # wait for modules in thread to load, preventing a thread-related cx_Freeze crash
                 time.sleep(0.2)
@@ -258,3 +258,18 @@ class EventHandlerThread(QtCore.QThread):
             if self.should_quit:
                 break
             time.sleep(0.2)
+
+
+class OnionCleanupThread(QtCore.QThread):
+    """
+    Wait for Tor rendezvous circuits to close in a separate thread
+    """
+
+    def __init__(self, common):
+        super(OnionCleanupThread, self).__init__()
+        self.common = common
+        self.common.log("OnionCleanupThread", "__init__")
+
+    def run(self):
+        self.common.log("OnionCleanupThread", "run")
+        self.common.gui.onion.cleanup()
diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree
index df910e50..02ed6358 100644
--- a/docs/gettext/.doctrees/advanced.doctree
+++ b/docs/gettext/.doctrees/advanced.doctree
diff --git a/docs/gettext/.doctrees/develop.doctree b/docs/gettext/.doctrees/develop.doctree
index 50cbb244..38d8ee51 100644
--- a/docs/gettext/.doctrees/develop.doctree
+++ b/docs/gettext/.doctrees/develop.doctree
diff --git a/docs/gettext/.doctrees/environment.pickle b/docs/gettext/.doctrees/environment.pickle
index 2210d69f..a252e159 100644
--- a/docs/gettext/.doctrees/environment.pickle
+++ b/docs/gettext/.doctrees/environment.pickle
diff --git a/docs/gettext/.doctrees/features.doctree b/docs/gettext/.doctrees/features.doctree
index 3ca2703d..71d48cc8 100644
--- a/docs/gettext/.doctrees/features.doctree
+++ b/docs/gettext/.doctrees/features.doctree
diff --git a/docs/gettext/.doctrees/help.doctree b/docs/gettext/.doctrees/help.doctree
index 95e2b864..0826c949 100644
--- a/docs/gettext/.doctrees/help.doctree
+++ b/docs/gettext/.doctrees/help.doctree
diff --git a/docs/gettext/.doctrees/index.doctree b/docs/gettext/.doctrees/index.doctree
index 13372791..e3342592 100644
--- a/docs/gettext/.doctrees/index.doctree
+++ b/docs/gettext/.doctrees/index.doctree
diff --git a/docs/gettext/.doctrees/install.doctree b/docs/gettext/.doctrees/install.doctree
index f61ef2f9..7555064b 100644
--- a/docs/gettext/.doctrees/install.doctree
+++ b/docs/gettext/.doctrees/install.doctree
diff --git a/docs/gettext/.doctrees/security.doctree b/docs/gettext/.doctrees/security.doctree
index 71303eef..8cd57289 100644
--- a/docs/gettext/.doctrees/security.doctree
+++ b/docs/gettext/.doctrees/security.doctree
diff --git a/docs/gettext/.doctrees/tor.doctree b/docs/gettext/.doctrees/tor.doctree
index a001547b..c3e5f2a2 100644
--- a/docs/gettext/.doctrees/tor.doctree
+++ b/docs/gettext/.doctrees/tor.doctree
diff --git a/docs/gettext/advanced.pot b/docs/gettext/advanced.pot
index c3288812..616e3336 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-11-15 14:54-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/develop.pot b/docs/gettext/develop.pot
index 7038de40..fb851408 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-11-15 14:54-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/features.pot b/docs/gettext/features.pot
index 836890a4..e2fb07f4 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-11-15 14:54-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/help.pot b/docs/gettext/help.pot
index 1f91e4c3..e18040f0 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-11-15 14:54-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/index.pot b/docs/gettext/index.pot
index faa41716..edd6e67d 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-09-03 11:46-0700\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 7f33fe4a..a2ab8078 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -33,11 +33,11 @@ msgid "Install in Linux"
 msgstr ""
 
 #: ../../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."
+msgid "There are various ways to install OnionShare for Linux, but the recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure that you'll always use the newest version and run OnionShare inside of a sandbox."
 msgstr ""
 
 #: ../../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."
+msgid "Snap support is built-in to Ubuntu and Fedora comes with Flatpak support, but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -45,11 +45,11 @@ msgid "**Install OnionShare using Flatpak**: https://flathub.org/apps/details/or
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: 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."
+msgid "You can also download and install PGP-signed ``.flatpak`` or ``.snap`` packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
 #: ../../source/install.rst:28
@@ -77,7 +77,7 @@ msgid "Signatures"
 msgstr ""
 
 #: ../../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>`_."
+msgid "You can find the signatures (as ``.asc`` files), as well as Windows, macOS, Flatpak, Snap, 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:47
@@ -85,7 +85,7 @@ msgid "Verifying"
 msgstr ""
 
 #: ../../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::"
+msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary and and ``.asc`` signature, you can verify the binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -97,9 +97,9 @@ msgid "The expected output looks like this::"
 msgstr ""
 
 #: ../../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.)"
+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: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."
+msgid "If you want to learn more about verifying PGP signatures, the guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://support.torproject.org/tbb/how-to-verify-signature/>`_ may be useful."
 msgstr ""
diff --git a/docs/gettext/security.pot b/docs/gettext/security.pot
index c038037a..518c44e5 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -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, 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."
+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², 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
@@ -57,5 +57,5 @@ msgid "**Communicating the OnionShare address might not be secure.** Communicati
 msgstr ""
 
 #: ../../source/security.rst:24
-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."
+msgid "**Communicating the OnionShare address might not be anonymous.** Extra precautions must be taken to ensure the OnionShare address is communicated anonymously. A new email or chat account, only accessed over Tor, can be used to share the address. This isn't necessary unless anonymity is a goal."
 msgstr ""
diff --git a/docs/gettext/sphinx.pot b/docs/gettext/sphinx.pot
index ffc3bc79..05bdc208 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-09-03 11:37-0700\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 0812a342..db54ddff 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-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -53,7 +53,7 @@ msgid "This is fairly advanced. You'll need to know how edit plaintext files and
 msgstr ""
 
 #: ../../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``."
+msgid "Download the Tor Windows Expert Bundle `from <https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -77,7 +77,7 @@ msgid "You are now running a system ``tor`` process in Windows!"
 msgstr ""
 
 #: ../../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\"."
+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:61
@@ -85,7 +85,7 @@ msgid "Using a system ``tor`` in macOS"
 msgstr ""
 
 #: ../../source/tor.rst:63
-msgid "First, install `Homebrew <https://brew.sh/>`_ if you don't already have it. Then, install Tor::"
+msgid "First, install `Homebrew <https://brew.sh/>`_ if you don't already have it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
diff --git a/docs/source/_static/screenshots/advanced-save-tabs.png b/docs/source/_static/screenshots/advanced-save-tabs.png
index 18788167..0326efc9 100644
--- a/docs/source/_static/screenshots/advanced-save-tabs.png
+++ b/docs/source/_static/screenshots/advanced-save-tabs.png
diff --git a/docs/source/_static/screenshots/advanced-schedule-start-timer.png b/docs/source/_static/screenshots/advanced-schedule-start-timer.png
index e633fb37..9cc76474 100644
--- a/docs/source/_static/screenshots/advanced-schedule-start-timer.png
+++ b/docs/source/_static/screenshots/advanced-schedule-start-timer.png
diff --git a/docs/source/_static/screenshots/advanced-schedule-stop-timer.png b/docs/source/_static/screenshots/advanced-schedule-stop-timer.png
index 4938f00b..df9b2a6c 100644
--- a/docs/source/_static/screenshots/advanced-schedule-stop-timer.png
+++ b/docs/source/_static/screenshots/advanced-schedule-stop-timer.png
diff --git a/docs/source/_static/screenshots/chat-sharing.png b/docs/source/_static/screenshots/chat-sharing.png
index b4e8406f..518f5da0 100644
--- a/docs/source/_static/screenshots/chat-sharing.png
+++ b/docs/source/_static/screenshots/chat-sharing.png
diff --git a/docs/source/_static/screenshots/chat.png b/docs/source/_static/screenshots/chat.png
index aad601a1..5b507824 100644
--- a/docs/source/_static/screenshots/chat.png
+++ b/docs/source/_static/screenshots/chat.png
diff --git a/docs/source/_static/screenshots/receive-sharing.png b/docs/source/_static/screenshots/receive-sharing.png
index 5ab44ecd..983b3863 100644
--- a/docs/source/_static/screenshots/receive-sharing.png
+++ b/docs/source/_static/screenshots/receive-sharing.png
diff --git a/docs/source/_static/screenshots/receive-torbrowser.png b/docs/source/_static/screenshots/receive-torbrowser.png
index 0ad381d5..7fbc582b 100644
--- a/docs/source/_static/screenshots/receive-torbrowser.png
+++ b/docs/source/_static/screenshots/receive-torbrowser.png
diff --git a/docs/source/_static/screenshots/receive.png b/docs/source/_static/screenshots/receive.png
index 799c7879..b3f2a9a7 100644
--- a/docs/source/_static/screenshots/receive.png
+++ b/docs/source/_static/screenshots/receive.png
diff --git a/docs/source/_static/screenshots/share-files.png b/docs/source/_static/screenshots/share-files.png
index d0d5f280..52eaabc9 100644
--- a/docs/source/_static/screenshots/share-files.png
+++ b/docs/source/_static/screenshots/share-files.png
diff --git a/docs/source/_static/screenshots/share-sharing.png b/docs/source/_static/screenshots/share-sharing.png
index 6f3f41ae..4df8329a 100644
--- a/docs/source/_static/screenshots/share-sharing.png
+++ b/docs/source/_static/screenshots/share-sharing.png
diff --git a/docs/source/_static/screenshots/share-torbrowser.png b/docs/source/_static/screenshots/share-torbrowser.png
index ac0f4983..3063f611 100644
--- a/docs/source/_static/screenshots/share-torbrowser.png
+++ b/docs/source/_static/screenshots/share-torbrowser.png
diff --git a/docs/source/_static/screenshots/share.png b/docs/source/_static/screenshots/share.png
index f03c68ba..ea79210b 100644
--- a/docs/source/_static/screenshots/share.png
+++ b/docs/source/_static/screenshots/share.png
diff --git a/docs/source/_static/screenshots/tabs.png b/docs/source/_static/screenshots/tabs.png
index 8b96ace2..de75a17d 100644
--- a/docs/source/_static/screenshots/tabs.png
+++ b/docs/source/_static/screenshots/tabs.png
diff --git a/docs/source/_static/screenshots/website-files.png b/docs/source/_static/screenshots/website-files.png
index 4bd293b2..49eec817 100644
--- a/docs/source/_static/screenshots/website-files.png
+++ b/docs/source/_static/screenshots/website-files.png
diff --git a/docs/source/_static/screenshots/website.png b/docs/source/_static/screenshots/website.png
index d745cf6a..3c34ca41 100644
--- a/docs/source/_static/screenshots/website.png
+++ b/docs/source/_static/screenshots/website.png
diff --git a/docs/source/locale/ar/LC_MESSAGES/install.po b/docs/source/locale/ar/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/ar/LC_MESSAGES/install.po
+++ b/docs/source/locale/ar/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/ar/LC_MESSAGES/security.po b/docs/source/locale/ar/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/ar/LC_MESSAGES/security.po
+++ b/docs/source/locale/ar/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/ar/LC_MESSAGES/tor.po b/docs/source/locale/ar/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/ar/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ar/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/ca/LC_MESSAGES/install.po b/docs/source/locale/ca/LC_MESSAGES/install.po
index afcaad12..0d4bdec4 100644
--- a/docs/source/locale/ca/LC_MESSAGES/install.po
+++ b/docs/source/locale/ca/LC_MESSAGES/install.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-25 18:28+0000\n"
 "Last-Translator: fadelkon <fadelkon@posteo.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ca\n"
+"Language-Team: ca <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/install.rst:2
@@ -41,15 +40,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -59,12 +58,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -107,10 +106,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -121,8 +120,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -137,17 +136,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -264,3 +263,75 @@ msgstr ""
 #~ "Project <https://2019.www.torproject.org/docs/verifying-"
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
+
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/ca/LC_MESSAGES/security.po b/docs/source/locale/ca/LC_MESSAGES/security.po
index 0138e634..d6140d16 100644
--- a/docs/source/locale/ca/LC_MESSAGES/security.po
+++ b/docs/source/locale/ca/LC_MESSAGES/security.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-25 18:28+0000\n"
 "Last-Translator: fadelkon <fadelkon@posteo.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ca\n"
+"Language-Team: ca <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/security.rst:2
@@ -72,8 +71,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -99,10 +98,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -211,3 +210,36 @@ msgstr ""
 #~ "anonymity, such as co-workers who "
 #~ "know each other sharing work documents."
 #~ msgstr ""
+
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/ca/LC_MESSAGES/tor.po b/docs/source/locale/ca/LC_MESSAGES/tor.po
index 590e07da..2f8269ce 100644
--- a/docs/source/locale/ca/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ca/LC_MESSAGES/tor.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-25 18:28+0000\n"
 "Last-Translator: fadelkon <fadelkon@posteo.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ca\n"
+"Language-Team: ca <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/tor.rst:2
@@ -72,9 +71,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -118,9 +117,9 @@ msgid ""
 "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\"."
+"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:61
@@ -130,7 +129,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -413,3 +412,36 @@ msgstr ""
 #~ "to use a bridge, you should try"
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/da/LC_MESSAGES/install.po b/docs/source/locale/da/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/da/LC_MESSAGES/install.po
+++ b/docs/source/locale/da/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/da/LC_MESSAGES/security.po b/docs/source/locale/da/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/da/LC_MESSAGES/security.po
+++ b/docs/source/locale/da/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/da/LC_MESSAGES/tor.po b/docs/source/locale/da/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/da/LC_MESSAGES/tor.po
+++ b/docs/source/locale/da/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/de/LC_MESSAGES/install.po b/docs/source/locale/de/LC_MESSAGES/install.po
index 89c644ce..5edefbcd 100644
--- a/docs/source/locale/de/LC_MESSAGES/install.po
+++ b/docs/source/locale/de/LC_MESSAGES/install.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-11-19 08:28+0000\n"
-"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
+"Last-Translator: mv87 <mv87@dismail.de>\n"
 "Language-Team: de <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -43,18 +43,20 @@ msgstr "Installation unter Linux"
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 "Es gibt verschiedene Wege, OnionShare unter Linux zu installieren, aber "
 "empfohlen wird die Installation über das Flatpak <https://flatpak.org/>`_- "
-"oder Snapcraft <https://snapcraft.io/>`_-Paket."
+"oder Snapcraft <https://snapcraft.io/>`_-Paket. Per Flatpak und Snap wird "
+"sichergestellt, dass du immer die neueste Version hast und dass OnionShare "
+"in einer Sandbox läuft."
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 "Snapcraft ist in Ubuntu und Flatpak ist in Fedora integriert, aber du "
 "entscheidest, welche der Möglichkeiten du nutzt. Beide Möglichkeiten "
@@ -65,18 +67,17 @@ msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**Installation von OnionShare über Flatpak**: https://flathub.org/apps/"
-"details/org.onionshare.OnionShare"
+"**Installation von OnionShare über Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
-"**Installation von OnionShare über Snapcraft**: https://snapcraft.io/"
-"onionshare"
+"**Installation von OnionShare über Snap**: https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 "Du kannst auch PGP-signierte ``.flatpak``- oder ``.snap``-Pakete von "
@@ -97,10 +98,10 @@ msgid ""
 msgstr ""
 "Du kannst das heruntergeladene Paket dahingehend überprüfen, dass es aus "
 "offizieller Quelle stammt und nicht verändert wurde, indem du seine PGP-"
-"Signatur überprüfst. Unter Windows und macOS ist dieser Schritt optional und "
-"bietet einen zusätzlichen Schutz: die OnionShare-Binärdateien enthalten "
-"betriebssystemspezifische Signaturen, und du kannst dich auch nur auf diese "
-"verlassen, falls du dies möchtest."
+"Signatur überprüfst. Unter Windows und macOS ist dieser Schritt optional "
+"und bietet einen zusätzlichen Schutz: die OnionShare-Binärdateien "
+"enthalten betriebssystemspezifische Signaturen, und du kannst dich auch "
+"nur auf diese verlassen, falls du dies möchtest."
 
 #: ../../source/install.rst:34
 msgid "Signing key"
@@ -114,12 +115,12 @@ msgid ""
 "<https://keys.openpgp.org/vks/v1/by-"
 "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 msgstr ""
-"Pakete werden von Micah Leh, dem Hauptentwickler, mit seinem öffentlichen "
-"PGP-Schlüssel mit dem Fingerabdruck "
+"Pakete werden von Micah Leh, dem Hauptentwickler, mit seinem öffentlichen"
+" PGP-Schlüssel mit dem Fingerabdruck "
 "``927F419D7EC82C2F149C1BD1403C2657CD994F73``signiert. Du kannst Micahs "
-"Schlüssel vom Schlüsselserver `keys.openpgp.org keyserver <https://keys."
-"openpgp.org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`"
-"_ herunterladen."
+"Schlüssel vom Schlüsselserver `keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_ herunterladen."
 
 #: ../../source/install.rst:38
 msgid ""
@@ -129,7 +130,8 @@ msgid ""
 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/index-de.html>`_."
+"verwenden, unter Windows `Gpg4win <https://www.gpg4win.org/index-"
+"de.html>`_."
 
 #: ../../source/install.rst:41
 msgid "Signatures"
@@ -137,10 +139,10 @@ msgstr "Signaturen"
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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-, Flatpak-, "
@@ -156,8 +158,8 @@ msgstr "Verifizierung"
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 "Sobald du Micahs öffentichen Schlüssel in deinen GnuPG-Schlüsselbund "
 "importiert, die Binärdatei und die passende ``.asc``-Signatur "
@@ -176,9 +178,9 @@ msgstr "Eine erwartete Ausgabe sollte wiefolgt aussehen::"
 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.)"
+"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 "
@@ -189,10 +191,10 @@ msgstr ""
 
 #: ../../source/install.rst:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 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/"
diff --git a/docs/source/locale/de/LC_MESSAGES/security.po b/docs/source/locale/de/LC_MESSAGES/security.po
index b0384ceb..e1f11d9a 100644
--- a/docs/source/locale/de/LC_MESSAGES/security.po
+++ b/docs/source/locale/de/LC_MESSAGES/security.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:43-0800\n"
-"PO-Revision-Date: 2020-11-17 10:28+0000\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
 "Last-Translator: mv87 <mv87@dismail.de>\n"
 "Language-Team: de <LL@li.org>\n"
 "Language: de\n"
@@ -46,12 +46,13 @@ msgid ""
 "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. Bei der "
-"Nutzung von OnionShare werden Dienste direkt auf deinem Rechner gehostet. "
-"Beim Teilen von Dateien über OnionShare werden diese auf keinerlei Server "
-"hochgeladen. Wenn du einen Chatroom über OnionShare erstellst, ist auch "
-"hierfür dein Rechner zugleich der Server. Dies vermeidet das übliche "
-"Paradigma, dass man den Rechnern anderer vertrauen können muss."
+"**Dritte haben keinen Zugriff auf das, was über OnionShare** läuft. Bei "
+"der Nutzung von OnionShare werden Dienste direkt auf deinem Rechner "
+"gehostet. Beim Teilen von Dateien über OnionShare werden diese auf "
+"keinerlei Server hochgeladen. Wenn du einen Chatroom über OnionShare "
+"erstellst, ist auch hierfür dein Rechner zugleich der Server. Dies "
+"vermeidet das übliche Paradigma, dass man den Rechnern anderer vertrauen "
+"können muss."
 
 #: ../../source/security.rst:13
 msgid ""
@@ -64,13 +65,14 @@ msgid ""
 "the onion service's private key."
 msgstr ""
 "**Schnüffler, die den Netzwerkverkehr mitschneiden, können die per "
-"OnionShare übertragenen Inhalte nicht sehen.** Die Verbindung zwischen dem "
-"Onion-Dienst und dem Tor Browser ist Ende-zu-Ende verschlüsselt. Das heißt, "
-"bei Angriffen auf das Netzwerk kann nichts außer verschlüsselten Tor-"
-"Datenpaketen gesehen werden. Selbst falls der Schnüffler ein bösartiger "
-"Rendezvous-Knotenpunkt sitzt, der als Bindeglied zwischen Tor Browser und "
-"dem Onion-Dienst von OnionShare genutzt wird, ist der Datenverkehr über den "
-"geheimen Schlüssel des Onion-Dienstes verschlüsselt."
+"OnionShare übertragenen Inhalte nicht sehen.** Die Verbindung zwischen "
+"dem Onion-Dienst und dem Tor Browser ist Ende-zu-Ende verschlüsselt. Das "
+"heißt, bei Angriffen auf das Netzwerk kann nichts außer verschlüsselten "
+"Tor-Datenpaketen gesehen werden. Selbst falls der Schnüffler ein "
+"bösartiger Rendezvous-Knotenpunkt sitzt, der als Bindeglied zwischen Tor "
+"Browser und dem Onion-Dienst von OnionShare genutzt wird, ist der "
+"Datenverkehr über den geheimen Schlüssel des Onion-Dienstes "
+"verschlüsselt."
 
 #: ../../source/security.rst:15
 msgid ""
@@ -93,20 +95,20 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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 ""
-"**Selbst wenn ein Angreifer die OnionShare-Adresse herausfindet, hat er auf "
-"die bereitgestellten Inhalte keinen Zugriff.** Frühere Angriffe auf das Tor-"
+"**Selbst wenn ein Angreifer den Onion-Dienst entdeckt, hat er auf die "
+"bereitgestellten Inhalte keinen Zugriff.** Frühere Angriffe auf das Tor-"
 "Netzwerk erlaubten es dem Angreifer, nicht öffentliche .onion-Adressen zu "
 "entdecken. Wenn ein Angreifer eine nicht öffentliche OnionShare-Adresse "
 "entdeckt, hält ihn ein Passwort vom Zugriff hierauf ab (es sei denn der "
 "OnionShare-Nutzer deaktiviert dies und macht den Dienst öffentlich). Das "
 "Passwort wird duch die Wahl zwei erzufälliger Wörter aus einer Liste von "
-"6800 Wörtern erzeugt, was 6800^2 oder ca. 46 Millionen mögliche Passwörter "
+"6800 Wörtern erzeugt, was 6800² oder ca. 46 Millionen mögliche Passwörter "
 "ergibt. Nur 20 Fehlversuche sind möglich, ehe OnionShare den Dienst stoppt, "
 "so dass das Passwort nicht per Bruteforce-Attacke herausgefunden werden kann."
 
@@ -127,29 +129,30 @@ msgid ""
 "isn't necessary when using OnionShare for something that isn't secret."
 msgstr ""
 "**Das Teilen der OnionShare-Adresse könnte nicht sicher geschehen.** Die "
-"Weitergabe der OnionShare-Adresse an andere liegt in der Verantwortung des "
-"OnionShare-Nutzers. Wenn es auf unsichere Weise geteilt wird (z.B. durch "
-"eine E-Mail, die von einem Angreifer abgefangen wird), weiß der Schnüffler, "
-"dass OnionShare benutzt wird. Wenn der Schnüffler dann die Adresse im Tor "
-"Browser aufruft, während der Dienst noch läuft, hat er darauf Zugriff. Um "
-"dies zu vermeiden, muss die Adresse sicher, über eine verschlüsselte "
-"Textnachricht (am besten als verschwindende Nachricht), eine verschlüsselte "
-"E-Mail, oder persönlich ausgetauscht werden. Dies ist jedoch nicht "
-"erforderlich, wenn OnionShare für etwas genutzt wird, was nicht geheim ist."
+"Weitergabe der OnionShare-Adresse an andere liegt in der Verantwortung "
+"des OnionShare-Nutzers. Wenn es auf unsichere Weise geteilt wird (z.B. "
+"durch eine E-Mail, die von einem Angreifer abgefangen wird), weiß der "
+"Schnüffler, dass OnionShare benutzt wird. Wenn der Schnüffler dann die "
+"Adresse im Tor Browser aufruft, während der Dienst noch läuft, hat er "
+"darauf Zugriff. Um dies zu vermeiden, muss die Adresse sicher, über eine "
+"verschlüsselte Textnachricht (am besten als verschwindende Nachricht), "
+"eine verschlüsselte E-Mail, oder persönlich ausgetauscht werden. Dies ist"
+" jedoch nicht erforderlich, wenn OnionShare für etwas genutzt wird, was "
+"nicht geheim ist."
 
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 "**Das Teilen der OnionShare-Adresse könnte nicht anonym geschehen.** Hierfür "
 "müssen eigens Maßnahmen getroffen werden, dass die OnionShare-Adresse anonym "
 "weitergegeben wird. Ein neues E-Mail- oder Chatkonto, auf welches nur über "
 "Tor zugegriffen wird, kann zur anonymen Weitergabe genutzt werden. Dies ist "
-"jedoch nicht erforderlich, soweit Anonymität nicht bezweckt wird."
+"jedoch nicht erforderlich, soweit Anonymität kein Schutzziel ist."
 
 #~ msgid ""
 #~ "**Third parties don't have access to "
diff --git a/docs/source/locale/de/LC_MESSAGES/tor.po b/docs/source/locale/de/LC_MESSAGES/tor.po
index 3521e6ab..6244b1aa 100644
--- a/docs/source/locale/de/LC_MESSAGES/tor.po
+++ b/docs/source/locale/de/LC_MESSAGES/tor.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-11-19 08:28+0000\n"
-"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
+"Last-Translator: mv87 <mv87@dismail.de>\n"
 "Language-Team: de <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -28,9 +28,9 @@ 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 ""
-"Lege fest, wie OnionShare sich mit Tor verbinden soll, indem du auf das „⚙“-"
-"Symbol am unteren rechten Rand vom OnionShare-Fenster klickst, um die "
-"entsprechenden Einstellungen zu sehen."
+"Lege fest, wie OnionShare sich mit Tor verbinden soll, indem du auf das "
+"„⚙“-Symbol am unteren rechten Rand vom OnionShare-Fenster klickst, um die"
+" entsprechenden Einstellungen zu sehen."
 
 #: ../../source/tor.rst:9
 msgid "Use the ``tor`` bundled with OnionShare"
@@ -42,8 +42,8 @@ msgid ""
 "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:14
 msgid ""
@@ -52,10 +52,11 @@ msgid ""
 "with other ``tor`` processes on your computer, so you can use the Tor "
 "Browser or the system ``tor`` on their own."
 msgstr ""
-"Wenn du OpenShare öffnest, wird ein dafür vorkonfigurierter ``tor``-Prozess "
-"im Hintergrund gestartet. Dieser kommt anderen ``tor``-Prozessen auf deinem "
-"Rechner nicht in die Quere, so dass du den Tor Browser oder den systemweiten "
-"``tor``-Dienst unabhängig voneinander nutzen kannst."
+"Wenn du OpenShare öffnest, wird ein dafür vorkonfigurierter "
+"``tor``-Prozess im Hintergrund gestartet. Dieser kommt anderen "
+"``tor``-Prozessen auf deinem Rechner nicht in die Quere, so dass du den "
+"Tor Browser oder den systemweiten ``tor``-Dienst unabhängig voneinander "
+"nutzen kannst."
 
 #: ../../source/tor.rst:18
 msgid "Attempt auto-configuration with Tor Browser"
@@ -68,10 +69,11 @@ msgid ""
 "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 ""
-"Falls du den Tor Browser `heruntergeladen hast <https://www.torproject.org>`"
-"_ und keine zwei ``Tor``-Prozesse laufen haben möchtest, kannst du den "
-"``Tor``-Prozess des Tor Browsers nutzen. Damit dies funktionierst, musst du "
-"den Tor Browser im Hintergrund geöffnet lassen, so lange du OnionShare nutzt."
+"Falls du den Tor Browser `heruntergeladen hast "
+"<https://www.torproject.org>`_ und keine zwei ``Tor``-Prozesse laufen "
+"haben möchtest, kannst du den ``Tor``-Prozess des Tor Browsers nutzen. "
+"Damit dies funktionierst, musst du den Tor Browser im Hintergrund "
+"geöffnet lassen, so lange du OnionShare nutzt."
 
 #: ../../source/tor.rst:24
 msgid "Using a system ``tor`` in Windows"
@@ -88,15 +90,14 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:\\Programme (x86)\\`` und benenne "
-"ihn zu ``tor-win32`` um, so dass sich in diesem Ordner die beiden Ordner "
-"``Data`` und ``Tor`` befinden."
+"Lade das Tor Windows Expert Bundle `von <https://www.torproject.org/download/"
+"tor/>`_ herunter. Entpacke die komprimierte Datei und kopiere den "
+"extrahierten Ordner nach ``C:\\Programme (x86)\\``. Benenne den entpackten "
+"Ordner, der ``Data`` und ``Tor`` beinhaltet, nach ``tor-win32`` um."
 
 #: ../../source/tor.rst:32
 msgid ""
@@ -106,10 +107,11 @@ msgid ""
 "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:39
 msgid ""
@@ -117,8 +119,8 @@ msgid ""
 "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:41
@@ -127,9 +129,9 @@ msgid ""
 "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:46
 msgid ""
@@ -140,8 +142,8 @@ msgid ""
 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:50
 msgid "You are now running a system ``tor`` process in Windows!"
@@ -153,16 +155,17 @@ msgid ""
 "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\"."
+"to the control port password you picked above. Click the \"Test "
+"Connection to Tor\" button. If all goes well, you should see \"Connected "
+"to the Tor controller\"."
 msgstr ""
 "Öffne OnionShare und klicke auf das „⚙“-Symbol. Unter „Wie soll sich "
 "OnionShare mit Tor verbinden?“ wähle „Verbinde über Steuerungsport“ und "
 "setze den „Steuerungsport“ auf ``127.0.0.1`` und „Port“ auf ``9051``. Unter "
 "„Tor-Authentifizierungseinstellungen“ wähle „Passwort“ und gib das Passwort "
 "ein, das du zuvor für den Steuerungsport festgelegt hast. Klicke dann auf „"
-"Verbindung zu Tor testen“."
+"Verbindung zu Tor testen“. Wenn alles geklappt hat, sollte „Mit dem Tor-"
+"Controller verbunden“ erscheinen."
 
 #: ../../source/tor.rst:61
 msgid "Using a system ``tor`` in macOS"
@@ -171,7 +174,7 @@ msgstr "Benutze einen systemweiten Tor-Dienst in macOS"
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 "Installiere zunächst `Homebrew <http://brew.sh/>`_, falls du es noch nicht "
 "hast. Installiere dann Tor::"
@@ -193,11 +196,11 @@ msgid ""
 "cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 "Öffne OnionShare und klicke auf das „⚙“-Symbol. Unter “Wie soll sich "
-"OnionShare mit Tor verbinden?“ wähle „Verbinde über Socket-Datei“ und lege "
-"als Socket-Datei ``/usr/local/var/run/tor/control.socket`` fest. Unter „Tor-"
-"Authentifizierungs-Einstellungen“ wähle „Keine Identifizierung, oder "
-"Identifizierung über Cookie“. Klicke auf den Button „Verbindung zu Tor "
-"testen“."
+"OnionShare mit Tor verbinden?“ wähle „Verbinde über Socket-Datei“ und "
+"lege als Socket-Datei ``/usr/local/var/run/tor/control.socket`` fest. "
+"Unter „Tor-Authentifizierungs-Einstellungen“ wähle „Keine "
+"Identifizierung, oder Identifizierung über Cookie“. Klicke auf den Button"
+" „Verbindung zu Tor testen“."
 
 #: ../../source/tor.rst:84 ../../source/tor.rst:104
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
@@ -216,8 +219,8 @@ msgid ""
 "`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 "
+"Installiere zuerst das Tor-Paket. Falls du Debian, Ubuntu oder eine "
+"ähnliche Distribution nutzt, empfiehlt sich das `offizielle Repository "
 "<https://support.torproject.org/de/apt/tor-deb-repo/>`_ des Tor-Projekts."
 
 #: ../../source/tor.rst:91
@@ -226,8 +229,8 @@ msgid ""
 "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."
 
@@ -248,12 +251,12 @@ msgid ""
 "\"No authentication, or cookie authentication\". Click the \"Test "
 "Connection to Tor\" button."
 msgstr ""
-"Starte deinen Rechner neu. Öffne dann OnionShare und klicke auf das „⚙“-"
-"Symbol. Unter „Wie soll sich OnionShare mit Tor verbinden?“ wähle „Verbinde "
-"über eine Socket-Datei“. Setze als Socket-Datei ``/var/run/tor/control``. "
-"Unter „Tor-Authentifizierungseinstellungen“ wähle “Keine Authentifizierung, "
-"oder Authentizifierung über Cookie“. Klicke dann auf den Knopf „Teste die "
-"Verbindung zu Tor“."
+"Starte deinen Rechner neu. Öffne dann OnionShare und klicke auf das "
+"„⚙“-Symbol. Unter „Wie soll sich OnionShare mit Tor verbinden?“ wähle "
+"„Verbinde über eine Socket-Datei“. Setze als Socket-Datei "
+"``/var/run/tor/control``. Unter „Tor-Authentifizierungseinstellungen“ "
+"wähle “Keine Authentifizierung, oder Authentizifierung über Cookie“. "
+"Klicke dann auf den Knopf „Teste die Verbindung zu Tor“."
 
 #: ../../source/tor.rst:107
 msgid "Using Tor bridges"
@@ -267,10 +270,10 @@ msgid ""
 "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:111
 msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
@@ -283,11 +286,12 @@ msgid ""
 "obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
 "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 ""
@@ -431,3 +435,22 @@ msgstr ""
 #~ " testen\". Falls alles klappt, solltest "
 #~ "du erfolgreich mit dem Tor-Netzwerk "
 #~ "verbunden sein."
+
+#~ 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 ""
+#~ "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:\\Programme "
+#~ "(x86)\\`` und benenne ihn zu ``tor-"
+#~ "win32`` um, so dass sich in diesem"
+#~ " Ordner die beiden Ordner ``Data`` "
+#~ "und ``Tor`` befinden."
diff --git a/docs/source/locale/el/LC_MESSAGES/install.po b/docs/source/locale/el/LC_MESSAGES/install.po
index 41af240f..4fd23539 100644
--- a/docs/source/locale/el/LC_MESSAGES/install.po
+++ b/docs/source/locale/el/LC_MESSAGES/install.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-28 11:28+0000\n"
 "Last-Translator: george k <norhorn@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: el\n"
+"Language-Team: el <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/install.rst:2
@@ -40,49 +39,53 @@ msgid "Install in Linux"
 msgstr "Εγκατάσταση σε Linux"
 
 #: ../../source/install.rst:14
+#, fuzzy
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
-"Υπάρχουν αρκετοί τρόποι εγκατάστασης του OnionShare για Linux, προτείνεται "
-"όμως να γίνει μέσω του `Flatpak <https://flatpak.org/>`_ ή του `Snapcraft "
-"<https://snapcraft.io/>`_. Το Flatpak και το Snapcraft διασφαλίζουν ότι θα "
-"χρησιμοποιείτε πάντα τη νεότερη έκδοση και ότι θα εκτελείτε το OnionShare "
-"μέσα σε sandbox."
+"Υπάρχουν αρκετοί τρόποι εγκατάστασης του OnionShare για Linux, "
+"προτείνεται όμως να γίνει μέσω του `Flatpak <https://flatpak.org/>`_ ή "
+"του `Snapcraft <https://snapcraft.io/>`_. Το Flatpak και το Snapcraft "
+"διασφαλίζουν ότι θα χρησιμοποιείτε πάντα τη νεότερη έκδοση και ότι θα "
+"εκτελείτε το OnionShare μέσα σε sandbox."
 
 #: ../../source/install.rst:17
+#, fuzzy
 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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
-"Το Snapcraft είναι ενσωματωμένο στο Ubuntu και το Flatpak στο Fedora, αλλά "
-"ποιό θα χρησιμοποιήσετε εξαρτάται από εσάς. Και τα δύο λειτουργούν σε όλες "
-"τις διανομές Linux."
+"Το Snapcraft είναι ενσωματωμένο στο Ubuntu και το Flatpak στο Fedora, "
+"αλλά ποιό θα χρησιμοποιήσετε εξαρτάται από εσάς. Και τα δύο λειτουργούν "
+"σε όλες τις διανομές Linux."
 
 #: ../../source/install.rst:19
 msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**Εγκατάσταση του OnionShare με χρήση του Flatpak**: https://flathub.org/"
-"apps/details/org.onionshare.OnionShare"
+"**Εγκατάσταση του OnionShare με χρήση του Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#, fuzzy
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
-"**Εγκατάσταση του OnionShare με χρήση του Snapcraft**: https://snapcraft.io/"
-"onionshare"
+"**Εγκατάσταση του OnionShare με χρήση του Snapcraft**: "
+"https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
+#, fuzzy
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
-"Μπορείτε επίσης κάνετε λήψη και εγκατάσταση ενός πακέτου PGP-signed ``."
-"flatpak`` ή ``.snap`` από https://onionshare.org/dist/."
+"Μπορείτε επίσης κάνετε λήψη και εγκατάσταση ενός πακέτου PGP-signed "
+"``.flatpak`` ή ``.snap`` από https://onionshare.org/dist/."
 
 #: ../../source/install.rst:28
 msgid "Verifying PGP signatures"
@@ -96,11 +99,12 @@ msgid ""
 "binaries include operating system-specific signatures, and you can just "
 "rely on those alone if you'd like."
 msgstr ""
-"Μπορείτε να επαληθεύσετε ότι το πακέτο που κατεβάσετε είναι νόμιμο και δεν "
-"έχει παραβιαστεί, επαληθεύοντας την υπογραφή του PGP. Για Windows και macOS, "
-"αυτό το βήμα είναι προαιρετικό και παρέχει άμυνα σε βάθος: τα δυαδικά αρχεία "
-"OnionShare περιλαμβάνουν συγκεκριμένες υπογραφές λειτουργικού συστήματος και "
-"μπορείτε απλώς να βασιστείτε σε αυτά και μόνο αν θέλετε."
+"Μπορείτε να επαληθεύσετε ότι το πακέτο που κατεβάσετε είναι νόμιμο και "
+"δεν έχει παραβιαστεί, επαληθεύοντας την υπογραφή του PGP. Για Windows και"
+" macOS, αυτό το βήμα είναι προαιρετικό και παρέχει άμυνα σε βάθος: τα "
+"δυαδικά αρχεία OnionShare περιλαμβάνουν συγκεκριμένες υπογραφές "
+"λειτουργικού συστήματος και μπορείτε απλώς να βασιστείτε σε αυτά και μόνο"
+" αν θέλετε."
 
 #: ../../source/install.rst:34
 msgid "Signing key"
@@ -117,9 +121,9 @@ msgstr ""
 "Τα πακέτα υπογράφονται από τον Micah Lee, τον βασικό προγραμματιστή, "
 "χρησιμοποιώντας το δημόσιο κλειδί του PGP με το αποτύπωμα "
 "``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Μπορείτε να κατεβάσετε το "
-"κλειδί του Micah από το διακομιστή κλειδιών keys.openpgp.org <https://keys."
-"openpgp.org/vks/v1/by-fingerprint/"
-"927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"κλειδί του Micah από το διακομιστή κλειδιών keys.openpgp.org "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 
 #: ../../source/install.rst:38
 msgid ""
@@ -127,41 +131,43 @@ msgid ""
 "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:41
 msgid "Signatures"
 msgstr "Υπογραφές"
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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, "
-"Flatpak, Snapcraft και αρχεία εγκατάστασης στο https://onionshare.org/dist/ "
-"στο φάκελο με όνομα αναλογό της έκδοσης του OnionShare. Μπορείτε επίσης τα "
-"βρέιτε και στη `σελίδα εκδόσεων του GitHub <https://github.com/micahflee/"
-"onionshare/releases>`_."
+"Flatpak, Snapcraft και αρχεία εγκατάστασης στο "
+"https://onionshare.org/dist/ στο φάκελο με όνομα αναλογό της έκδοσης του "
+"OnionShare. Μπορείτε επίσης τα βρέιτε και στη `σελίδα εκδόσεων του GitHub"
+" <https://github.com/micahflee/onionshare/releases>`_."
 
 #: ../../source/install.rst:47
 msgid "Verifying"
 msgstr "Επιβεβαίωση"
 
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
-"Με την εισαγωγή του δημόσιου κλειδιού του Micah στο GnuPG keychain, τη λήψη "
-"του δυαδικού και της υπογραφής ``.asc``, μπορείτε να επιβεβαιώσετε το "
-"δυαδικό σύστημα για macOS σε ένα τερματικό όπως::"
+"Με την εισαγωγή του δημόσιου κλειδιού του Micah στο GnuPG keychain, τη "
+"λήψη του δυαδικού και της υπογραφής ``.asc``, μπορείτε να επιβεβαιώσετε "
+"το δυαδικό σύστημα για macOS σε ένα τερματικό όπως::"
 
 #: ../../source/install.rst:53
 msgid "Or for Windows, in a command-prompt like this::"
@@ -172,30 +178,33 @@ msgid "The expected output looks like this::"
 msgstr "Θα πρέπει να δείτε κάτι όπως::"
 
 #: ../../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.)"
+"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 ""
-"Εάν δεν εμφανιστεί το 'Σωστή υπογραφή από', ενδέχεται να υπάρχει πρόβλημα με "
-"την ακεραιότητα του αρχείου (κακόβουλο ή άλλο) και δεν πρέπει να "
+"Εάν δεν εμφανιστεί το 'Σωστή υπογραφή από', ενδέχεται να υπάρχει πρόβλημα"
+" με την ακεραιότητα του αρχείου (κακόβουλο ή άλλο) και δεν πρέπει να "
 "εγκαταστήσετε το πακέτο. (Η ΠΡΟΕΙΔΟΠΟΙΗΣΗ που φαίνεται παραπάνω, δεν "
 "αποτελεί πρόβλημα με το πακέτο: σημαίνει μόνο ότι δεν έχετε ήδη ορίσει "
 "κανένα επίπεδο «εμπιστοσύνης» του κλειδιού PGP του Micah.)"
 
 #: ../../source/install.rst:71
+#, fuzzy
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 "Εάν θέλετε να μάθετε περισσότερα σχετικά με την επαλήθευση των υπογραφών "
-"PGP, οι οδηγοί για `Qubes OS <https://www.qubes-os.org/security/"
-"verifying-signatures/>`_ και το `Tor Project <https://support.torproject.org/"
-"tbb/how-to-verify-signature/>`_ θα σας φανούν χρήσιμα."
+"PGP, οι οδηγοί για `Qubes OS <https://www.qubes-os.org/security"
+"/verifying-signatures/>`_ και το `Tor Project "
+"<https://support.torproject.org/tbb/how-to-verify-signature/>`_ θα σας "
+"φανούν χρήσιμα."
 
 #~ msgid "Install on Windows or macOS"
 #~ msgstr ""
@@ -311,3 +320,4 @@ msgstr ""
 #~ "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 be8a75ce..a05647ec 100644
--- a/docs/source/locale/el/LC_MESSAGES/security.po
+++ b/docs/source/locale/el/LC_MESSAGES/security.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-12-02 19:29+0000\n"
 "Last-Translator: george k <norhorn@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: el\n"
+"Language-Team: el <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/security.rst:2
@@ -26,13 +25,14 @@ msgstr "Σχεδίαση ασφαλείας"
 #: ../../source/security.rst:4
 msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
 msgstr ""
-"Δείτε το :ref:'how_it_works' πρώτα, για να μάθετε πώς λειτουργεί OnionShare."
+"Δείτε το :ref:'how_it_works' πρώτα, για να μάθετε πώς λειτουργεί "
+"OnionShare."
 
 #: ../../source/security.rst:6
 msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
 msgstr ""
-"Όπως όλες οι εφαρμογές και το OnionShare ενδέχεται να περιέχει σφάλματα ή "
-"ευπάθειες."
+"Όπως όλες οι εφαρμογές και το OnionShare ενδέχεται να περιέχει σφάλματα ή"
+" ευπάθειες."
 
 #: ../../source/security.rst:9
 msgid "What OnionShare protects against"
@@ -47,12 +47,13 @@ msgid ""
 "server for that too. This avoids the traditional model of having to trust"
 " the computers of others."
 msgstr ""
-"**Τρίτα μέρη δεν έχουν πρόσβαση σε οτιδήποτε συμβαίνει στο OnionShare.** Η "
-"χρήση του OnionShare σημαίνει φιλοξενία των υπηρεσιών απευθείας στον "
+"**Τρίτα μέρη δεν έχουν πρόσβαση σε οτιδήποτε συμβαίνει στο OnionShare.** "
+"Η χρήση του OnionShare σημαίνει φιλοξενία των υπηρεσιών απευθείας στον "
 "υπολογιστή σας. Τα αρχεία που διαμοιράζεστε με το OnionShare, δεν "
 "μεταφορτώνονται σε κανέναν διακομιστή. Εάν δημιουργήσετε ένα δωμάτιο "
-"συνομιλίας OnionShare, ο υπολογιστής σας λειτουργεί ως διακομιστής. Με αυτό "
-"τον τρόπο δεν χρειάζεται να δείξετε εμπιστοσύνη σε υπολογιστές άλλων."
+"συνομιλίας OnionShare, ο υπολογιστής σας λειτουργεί ως διακομιστής. Με "
+"αυτό τον τρόπο δεν χρειάζεται να δείξετε εμπιστοσύνη σε υπολογιστές "
+"άλλων."
 
 #: ../../source/security.rst:13
 msgid ""
@@ -64,13 +65,13 @@ msgid ""
 "Browser with OnionShare's onion service, the traffic is encrypted using "
 "the onion service's private key."
 msgstr ""
-"**Δεν μπορεί να γίνει υποκλοπή στις υπηρεσίες μεταφορά του OnionShare. ** Η "
-"σύνδεση της υπηρεσίας onion Tor και του Tor Browser είναι κρυπτογραφημένη "
-"από άκρο σε άκρο. Αυτό σημαίνει ότι οι εισβολείς δικτύου δεν μπορούν να "
-"παρακολουθούν τίποτα εκτός από την κρυπτογραφημένη κίνηση. Ακόμα και με την "
-"υποκλοπή από κακόβουλο κόμβο που χρησιμοποιείται για τη σύνδεση του Tor "
-"Browser με την υπηρεσία OnionShare Onion, η κίνηση κρυπτογραφείται "
-"χρησιμοποιώντας το ιδιωτικό κλειδί της υπηρεσίας onion."
+"**Δεν μπορεί να γίνει υποκλοπή στις υπηρεσίες μεταφορά του OnionShare. **"
+" Η σύνδεση της υπηρεσίας onion Tor και του Tor Browser είναι "
+"κρυπτογραφημένη από άκρο σε άκρο. Αυτό σημαίνει ότι οι εισβολείς δικτύου "
+"δεν μπορούν να παρακολουθούν τίποτα εκτός από την κρυπτογραφημένη κίνηση."
+" Ακόμα και με την υποκλοπή από κακόβουλο κόμβο που χρησιμοποιείται για τη"
+" σύνδεση του Tor Browser με την υπηρεσία OnionShare Onion, η κίνηση "
+"κρυπτογραφείται χρησιμοποιώντας το ιδιωτικό κλειδί της υπηρεσίας onion."
 
 #: ../../source/security.rst:15
 msgid ""
@@ -81,35 +82,37 @@ msgid ""
 "identity of the OnionShare user."
 msgstr ""
 "**Η ανωνυμία των χρηστών OnionShare προστατεύεται από το Tor.** Τα "
-"OnionShare και Tor Browser προστατεύουν την ανωνυμία των χρηστών. Εφόσον ο "
-"χρήστης του OnionShare κοινοποιεί ανώνυμα τη διεύθυνση OnionShare με χρήστες "
-"του Tor Browser, οι χρήστες του Tor Browser και οι υποκλοπές δεν μπορούν να "
-"μάθουν την ταυτότητα του χρήστη του OnionShare."
+"OnionShare και Tor Browser προστατεύουν την ανωνυμία των χρηστών. Εφόσον "
+"ο χρήστης του OnionShare κοινοποιεί ανώνυμα τη διεύθυνση OnionShare με "
+"χρήστες του Tor Browser, οι χρήστες του Tor Browser και οι υποκλοπές δεν "
+"μπορούν να μάθουν την ταυτότητα του χρήστη του OnionShare."
 
 #: ../../source/security.rst:17
+#, fuzzy
 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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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 διευθύνσεις. Εάν μια επίθεση ανακαλύψει μια ιδιωτική διεύθυνση "
-"OnionShare, ένας κωδικός πρόσβασης θα τους εμποδίσει την πρόσβαση σε αυτήν ("
-"εκτός εάν ο χρήστης του OnionShare επιλέξει να την απενεργοποιήσει και να "
-"τον δημοσιοποιήσει). Ο κωδικός πρόσβασης δημιουργείται επιλέγοντας δύο "
-"τυχαίες λέξεις από μια λίστα 6800 λέξεων, δημιουργώντας 6800^2 ή περίπου 46 "
-"εκατομμύρια πιθανούς κωδικούς πρόσβασης. Μόνο 20 λανθασμένες υποθέσεις "
-"μπορούν να γίνουν προτού το OnionShare σταματήσει τον διακομιστή, "
-"αποτρέποντας τις βίαιες επιθέσεις κατά του κωδικού πρόσβασης."
+"**Εάν ένας εισβολέας μάθει για την υπηρεσία onion, εξακολουθεί να μην "
+"μπορεί να αποκτήσει πρόσβαση.** Προηγούμενες επιθέσεις εναντίον του "
+"δικτύου Tor για έρευνα υπηρεσιών onion επέτρεψαν στον εισβολέα να "
+"ανακαλύψει ιδιωτικές .onion διευθύνσεις. Εάν μια επίθεση ανακαλύψει μια "
+"ιδιωτική διεύθυνση OnionShare, ένας κωδικός πρόσβασης θα τους εμποδίσει "
+"την πρόσβαση σε αυτήν (εκτός εάν ο χρήστης του OnionShare επιλέξει να την"
+" απενεργοποιήσει και να τον δημοσιοποιήσει). Ο κωδικός πρόσβασης "
+"δημιουργείται επιλέγοντας δύο τυχαίες λέξεις από μια λίστα 6800 λέξεων, "
+"δημιουργώντας 6800^2 ή περίπου 46 εκατομμύρια πιθανούς κωδικούς "
+"πρόσβασης. Μόνο 20 λανθασμένες υποθέσεις μπορούν να γίνουν προτού το "
+"OnionShare σταματήσει τον διακομιστή, αποτρέποντας τις βίαιες επιθέσεις "
+"κατά του κωδικού πρόσβασης."
 
 #: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
@@ -127,31 +130,33 @@ msgid ""
 " 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 ενώ η υπηρεσία είναι ακόμα σε λειτουργία, μπορεί να αποκτήσει "
-"πρόσβαση σε αυτήν. Για να αποφευχθεί αυτό, η διεύθυνση πρέπει να "
-"κοινοποιείται με ασφάλεια, μέσω κρυπτογραφημένου μηνύματος κειμένου (πιθανώς "
-"με ενεργή τη διαγραφή μηνυμάτων), κρυπτογραφημένου email ή αυτοπροσώπως. Δεν "
-"είναι απαραίτητο όταν χρησιμοποιείτε το OnionShare για κάτι που δεν είναι "
-"μυστικό."
+"**Η γνωστοποίηση της διεύθυνσης OnionShare ενδέχεται να μην είναι "
+"ασφαλής.** Η γνωστοποίηση της διεύθυνσης OnionShare είναι ευθύνη του "
+"χρήστη OnionShare. Εάν σταλεί με ασφάλεια (όπως μέσω ενός μηνύματος "
+"ηλεκτρονικού ταχυδρομείου που παρακολουθείται από έναν εισβολέα), ένας "
+"υποκλοπέας μπορεί να πει ότι χρησιμοποιείται το OnionShare. Εάν ο "
+"θποκλοπέας φορτώσει τη διεύθυνση στο Tor Browser ενώ η υπηρεσία είναι "
+"ακόμα σε λειτουργία, μπορεί να αποκτήσει πρόσβαση σε αυτήν. Για να "
+"αποφευχθεί αυτό, η διεύθυνση πρέπει να κοινοποιείται με ασφάλεια, μέσω "
+"κρυπτογραφημένου μηνύματος κειμένου (πιθανώς με ενεργή τη διαγραφή "
+"μηνυμάτων), κρυπτογραφημένου email ή αυτοπροσώπως. Δεν είναι απαραίτητο "
+"όταν χρησιμοποιείτε το OnionShare για κάτι που δεν είναι μυστικό."
 
 #: ../../source/security.rst:24
+#, fuzzy
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
-"**Η γνωστοποίηση της διεύθυνσης OnionShare ενδέχεται να μην είναι ανώνυμη.** "
-"Πρέπει να ληφθούν επιπλέον μέτρα για να διασφαλιστεί ότι η διεύθυνση "
-"OnionShare κοινοποιείται ανώνυμα. Ένας νέος λογαριασμός email ή συνομιλίας, "
-"προσπελάσιμος μόνο μέσω Tor, μπορεί να χρησιμοποιηθεί για κοινή χρήση της "
-"διεύθυνσης. Δεν είναι απαραίτητο εκτός αν η ανωνυμία είναι στόχος."
+"**Η γνωστοποίηση της διεύθυνσης OnionShare ενδέχεται να μην είναι "
+"ανώνυμη.** Πρέπει να ληφθούν επιπλέον μέτρα για να διασφαλιστεί ότι η "
+"διεύθυνση OnionShare κοινοποιείται ανώνυμα. Ένας νέος λογαριασμός email ή"
+" συνομιλίας, προσπελάσιμος μόνο μέσω Tor, μπορεί να χρησιμοποιηθεί για "
+"κοινή χρήση της διεύθυνσης. Δεν είναι απαραίτητο εκτός αν η ανωνυμία "
+"είναι στόχος."
 
 #~ msgid "Security design"
 #~ msgstr ""
@@ -259,3 +264,4 @@ msgstr ""
 #~ "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 2f3f3fbc..ddfc7a7c 100644
--- a/docs/source/locale/el/LC_MESSAGES/tor.po
+++ b/docs/source/locale/el/LC_MESSAGES/tor.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-29 17:29+0000\n"
 "Last-Translator: george k <norhorn@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: el\n"
+"Language-Team: el <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/tor.rst:2
@@ -40,8 +39,8 @@ 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 ""
-"Ο προεπιλεγμένος, απλούστερος και συχνότερος τρόπος σύνδεσης του OnionShare "
-"με το Tor, όπου προτείνεται για τους περισσότερους χρήστες."
+"Ο προεπιλεγμένος, απλούστερος και συχνότερος τρόπος σύνδεσης του "
+"OnionShare με το Tor, όπου προτείνεται για τους περισσότερους χρήστες."
 
 #: ../../source/tor.rst:14
 msgid ""
@@ -50,10 +49,10 @@ msgid ""
 "with other ``tor`` processes on your computer, so you can use the Tor "
 "Browser or the system ``tor`` on their own."
 msgstr ""
-"Με την έναρξη του OnionShare, ξεκινά στο παρασκήνιο η προρυθμισμένη υπηρεσία "
-"του ``tor``. Δεν συνεργάζεται σε άλλες διαδικασίες ``tor`` του υπολογιστή "
-"σας, οπότε μπορείτε να χρησιμοποιήσετε το Tor Browser ή το σύστημα ``tor`` "
-"ξεχωριστά."
+"Με την έναρξη του OnionShare, ξεκινά στο παρασκήνιο η προρυθμισμένη "
+"υπηρεσία του ``tor``. Δεν συνεργάζεται σε άλλες διαδικασίες ``tor`` του "
+"υπολογιστή σας, οπότε μπορείτε να χρησιμοποιήσετε το Tor Browser ή το "
+"σύστημα ``tor`` ξεχωριστά."
 
 #: ../../source/tor.rst:18
 msgid "Attempt auto-configuration with Tor Browser"
@@ -66,11 +65,11 @@ msgid ""
 "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 ""
-"Εάν έχετε `κατεβάσει το Tor Browser <https://www.torproject.org>`_ και δεν "
-"θέλετε να εκτελούνται δύο διεργασίες ``tor``, μπορείτε να χρησιμοποιήσετε τη "
-"διαδικασία ``tor`` από το Tor Browser. Λάβετε υπόψη ότι πρέπει να "
-"διατηρήσετε το Tor Browser ανοιχτό στο παρασκήνιο ενώ χρησιμοποιείτε το "
-"OnionShare."
+"Εάν έχετε `κατεβάσει το Tor Browser <https://www.torproject.org>`_ και "
+"δεν θέλετε να εκτελούνται δύο διεργασίες ``tor``, μπορείτε να "
+"χρησιμοποιήσετε τη διαδικασία ``tor`` από το Tor Browser. Λάβετε υπόψη "
+"ότι πρέπει να διατηρήσετε το Tor Browser ανοιχτό στο παρασκήνιο ενώ "
+"χρησιμοποιείτε το OnionShare."
 
 #: ../../source/tor.rst:24
 msgid "Using a system ``tor`` in Windows"
@@ -81,20 +80,16 @@ msgid ""
 "This is fairly advanced. You'll need to know how edit plaintext files and"
 " do stuff as an administrator."
 msgstr ""
-"Είναι αρκετά προχωρημένο. Θα πρέπει να γνωρίζετε επεξεργασία αρχείων απλού "
-"κειμένου και να μπορείτε να κάνετε εργασίες ως διαχειριστής."
+"Είναι αρκετά προχωρημένο. Θα πρέπει να γνωρίζετε επεξεργασία αρχείων "
+"απλού κειμένου και να μπορείτε να κάνετε εργασίες ως διαχειριστής."
 
 #: ../../source/tor.rst:28
 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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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 Expert Bundle `από <https://www.torproject.org/"
-"download/tor/>`_. Κάντε εξαγωγή του αρχείου ΖΙΡ και αντιγράψτε τον φάκελο σε "
-"``C:\\Program Files (x86)\\``. Μετονομάστε τον εξαχθέν φάκελο σε ``Data`` "
-"και ``Tor`` μέσα στο ``tor-win32``."
 
 #: ../../source/tor.rst:32
 msgid ""
@@ -104,12 +99,12 @@ msgid ""
 "administrator, and use ``tor.exe --hash-password`` to generate a hash of "
 "your password. For example::"
 msgstr ""
-"Δημιουργήστε έναν ισχυρό κωδικό πρόσβασης για τη θύρα ελέγχου. (Η χρήση 7 "
-"λέξεων σε μια ακολουθία όπως το ``comprised stumble rummage work avenging "
-"construct volatile`` είναι καλή ιδέα για κωδικό πρόσβασης). Στη συνέχεια "
-"ανοίξτε ως διαχειριστής τη γραμμή εντολών (``cmd``) και χρησιμοποιήστε το ``"
-"tor. exe --hash-password`` για τη δημιουργία ενός αναγνωριστικού του κωδικού "
-"πρόσβασής σας. Για παράδειγμα::"
+"Δημιουργήστε έναν ισχυρό κωδικό πρόσβασης για τη θύρα ελέγχου. (Η χρήση 7"
+" λέξεων σε μια ακολουθία όπως το ``comprised stumble rummage work "
+"avenging construct volatile`` είναι καλή ιδέα για κωδικό πρόσβασης). Στη "
+"συνέχεια ανοίξτε ως διαχειριστής τη γραμμή εντολών (``cmd``) και "
+"χρησιμοποιήστε το ``tor. exe --hash-password`` για τη δημιουργία ενός "
+"αναγνωριστικού του κωδικού πρόσβασής σας. Για παράδειγμα::"
 
 #: ../../source/tor.rst:39
 msgid ""
@@ -139,44 +134,46 @@ msgid ""
 "`<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:50
 msgid "You are now running a system ``tor`` process in Windows!"
 msgstr "Εκτελείτε πλέον μια υπηρεσία του συστήματος ``tor`` σε Windows!"
 
 #: ../../source/tor.rst:52
+#, fuzzy
 msgid ""
 "Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
 "OnionShare connect to Tor?\" choose \"Connect using control port\", and "
 "set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
 "\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above Click the \"Test Connection"
-" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
-" controller\"."
+"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\" επιλέξτε \"Κωδικός "
-"πρόσβασης\" και προσθέστε τον κωδικό πρόσβασης που επιλέξατε παραπάνω. Κάντε "
-"κλικ στο κουμπί \"Έλεγχος σύνδεσης με το Tor\". Εάν όλα είναι σωστά θα δείτε "
-"το μήνυμα \"Εγινε σύνδεση με τον ελεγκτή Tor\"."
+"Ανοίξτε το OnionShare και κάντε κλικ στο εικονίδιο \"⚙\". Κάτω από το "
+"\"Πώς να συνδέεται το OnionShare με το Tor;'' επιλέξτε το \"Σύνδεση μέσω "
+"θύρας ελέγχου\" και ορίστε τη \"Θύρα ελέγχου\" σε ``127.0.0.1`` και "
+"\"Θύρα\" σε ``9051``. Κάτω από το \"Ρυθμίσεις επαλήθευσης Tor\" επιλέξτε "
+"\"Κωδικός πρόσβασης\" και προσθέστε τον κωδικό πρόσβασης που επιλέξατε "
+"παραπάνω. Κάντε κλικ στο κουμπί \"Έλεγχος σύνδεσης με το Tor\". Εάν όλα "
+"είναι σωστά θα δείτε το μήνυμα \"Εγινε σύνδεση με τον ελεγκτή Tor\"."
 
 #: ../../source/tor.rst:61
 msgid "Using a system ``tor`` in macOS"
 msgstr "Χρήση του συστήματος ``tor`` σε macOS"
 
 #: ../../source/tor.rst:63
+#, fuzzy
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
-"Εγκαταστήστε αρχικά το `Homebrew <https://brew.sh/>`_ εάν δεν το έχετε ήδη. "
-"Στη συνέχεια εγκαταστήστε το Tor::"
+"Εγκαταστήστε αρχικά το `Homebrew <https://brew.sh/>`_ εάν δεν το έχετε "
+"ήδη. Στη συνέχεια εγκαταστήστε το Tor::"
 
 #: ../../source/tor.rst:67
 msgid "Now configure Tor to allow connections from OnionShare::"
@@ -194,16 +191,18 @@ msgid ""
 "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\"."
+"Ανοίξτε το OnionShare και κάντε κλικ στο εικονίδιο \"⚙\". Κάτω από το "
+"\"Πώς να συνδέεται το OnionShare με το Tor;'' επιλέξτε το \"Σύνδεση μέσω "
+"αρχείου μετάβασης\" και ορίστε το αρχείο "
+"``/usr/local/var/run/tor/control.socket``. Κάτω από το \"Ρυθμίσεις "
+"επαλήθευσης Tor\" επιλέξτε \"Χωρίς επαλήθευση ή επαλήθευση με cookie\". "
+"Κάντε κλικ στο κουμπί \"Έλεγχος σύνδεσης με το Tor\"."
 
 #: ../../source/tor.rst:84 ../../source/tor.rst:104
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
 msgstr ""
-"εάν όλα είναι σωστά θα δείτε το μήνυμα \"Εγινε σύνδεση με τον ελεγκτή Tor\"."
+"εάν όλα είναι σωστά θα δείτε το μήνυμα \"Εγινε σύνδεση με τον ελεγκτή "
+"Tor\"."
 
 #: ../../source/tor.rst:87
 msgid "Using a system ``tor`` in Linux"
@@ -216,10 +215,10 @@ msgid ""
 "`official repository <https://support.torproject.org/apt/tor-deb-"
 "repo/>`_."
 msgstr ""
-"Αρχικά κάντε εγκατάσταση του πακέτου ``tor``. Εάν χρησιμοποιείται Debian, "
-"Ubuntu ή παρόμοια έκδοση με Linux distro, προτείνεται η χρήση του Tor "
-"Project από το επίσημο αποθετήριο <https://support.torproject.org/apt/"
-"tor-deb-repo/>`_."
+"Αρχικά κάντε εγκατάσταση του πακέτου ``tor``. Εάν χρησιμοποιείται Debian,"
+" Ubuntu ή παρόμοια έκδοση με Linux distro, προτείνεται η χρήση του Tor "
+"Project από το επίσημο αποθετήριο <https://support.torproject.org/apt"
+"/tor-deb-repo/>`_."
 
 #: ../../source/tor.rst:91
 msgid ""
@@ -227,8 +226,8 @@ msgid ""
 "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``) και "
+"Στη συνέχεια, προσθέστε τον χρήστη στην ομάδα που θα εκτελεί την υπηρεσία"
+" ``tor`` (στην περίπτωση του Debian και Ubuntu το ``debian-tor``) και "
 "ρυθμίστε το OnionShare ώστε να συνδεθεί με το αρχείο μετάβασής σας στο "
 "σύστημα ``tor``."
 
@@ -237,8 +236,8 @@ msgid ""
 "Add your user to the ``debian-tor`` group by running this command "
 "(replace ``username`` with your actual username)::"
 msgstr ""
-"Προσθέστε τον χρήστη σας στην ομάδα ``debian-tor`` εκτελόντας την εντολή ("
-"αντικαταστήστε το ``όνομα χρήστη`` με το δικό σας::"
+"Προσθέστε τον χρήστη σας στην ομάδα ``debian-tor`` εκτελόντας την εντολή "
+"(αντικαταστήστε το ``όνομα χρήστη`` με το δικό σας::"
 
 #: ../../source/tor.rst:97
 msgid ""
@@ -249,12 +248,12 @@ msgid ""
 "\"No authentication, or cookie authentication\". Click the \"Test "
 "Connection to Tor\" button."
 msgstr ""
-"Επανεκκινήστε τον υπολογιστή σας. Ανοίξτε το OnionShare και κάντε κλικ στο "
-"εικονίδιο \"⚙\". Κάτω από το \"Πώς να συνδέεται το OnionShare με το Tor;\" "
-"επιλέξτε \"Σύνδεση μέσω αρχείου μετάβασης\". Ρυθμίστε το αρχείο στο ``/var/"
-"run/tor/control``. Κάτω από τις \"Ρυθμίσεις επαλήθευσης Tor\" επιλέξτε "
-"\"Χωρίς επαλήθευση ή επαλήθευση με cookie\". Κάντε κλικ στο κουμπί \"Έλεγχος "
-"σύνδεσης με το Tor\"."
+"Επανεκκινήστε τον υπολογιστή σας. Ανοίξτε το OnionShare και κάντε κλικ "
+"στο εικονίδιο \"⚙\". Κάτω από το \"Πώς να συνδέεται το OnionShare με το "
+"Tor;\" επιλέξτε \"Σύνδεση μέσω αρχείου μετάβασης\". Ρυθμίστε το αρχείο "
+"στο ``/var/run/tor/control``. Κάτω από τις \"Ρυθμίσεις επαλήθευσης Tor\" "
+"επιλέξτε \"Χωρίς επαλήθευση ή επαλήθευση με cookie\". Κάντε κλικ στο "
+"κουμπί \"Έλεγχος σύνδεσης με το Tor\"."
 
 #: ../../source/tor.rst:107
 msgid "Using Tor bridges"
@@ -269,13 +268,15 @@ msgid ""
 msgstr ""
 "Εάν η πρόσβασή σας στο Διαδίκτυο λογοκρίνεται, μπορείτε να ρυθμίσετε το "
 "OnionShare να συνδέεται στο δίκτυο Tor με χρήση των `Tor bridges "
-"<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:111
 msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
 msgstr ""
-"Για να ρυθμίσετε μια γέφυρα, κάντε κλικ στο εικονίδιο \"⚙\" του OnionShare."
+"Για να ρυθμίσετε μια γέφυρα, κάντε κλικ στο εικονίδιο \"⚙\" του "
+"OnionShare."
 
 #: ../../source/tor.rst:113
 msgid ""
@@ -285,10 +286,10 @@ msgid ""
 "need to use a bridge, try the built-in obfs4 ones first."
 msgstr ""
 "Μπορείτε να χρησιμοποιήσετε τις προεγκατεστημένες συνδέσεις obfs4, οι "
-"ενσωματωμένες meek_lite (Azure) συνδέσεις ή οι προσαρμοσμένες γέφυρες, τις "
-"οποίες μπορείτε να αποκτήσετε από το Tor `BridgeDB <https://bridges."
-"torproject.org/>`_. Εάν πρέπει να χρησιμοποιήσετε μια γέφυρα, δοκιμάστε "
-"πρώτα τις obfs4."
+"ενσωματωμένες meek_lite (Azure) συνδέσεις ή οι προσαρμοσμένες γέφυρες, "
+"τις οποίες μπορείτε να αποκτήσετε από το Tor `BridgeDB "
+"<https://bridges.torproject.org/>`_. Εάν πρέπει να χρησιμοποιήσετε μια "
+"γέφυρα, δοκιμάστε πρώτα τις obfs4."
 
 #~ msgid "Using a system Tor in Mac OS X"
 #~ msgstr ""
@@ -490,3 +491,21 @@ msgstr ""
 #~ "to use a bridge, you should try"
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
+
+#~ 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 ""
+#~ "Κάντε λήψη του Tor Windows Expert "
+#~ "Bundle `από <https://www.torproject.org/download/tor/>`_."
+#~ " Κάντε εξαγωγή του αρχείου ΖΙΡ και"
+#~ " αντιγράψτε τον φάκελο σε ``C:\\Program "
+#~ "Files (x86)\\``. Μετονομάστε τον εξαχθέν "
+#~ "φάκελο σε ``Data`` και ``Tor`` μέσα "
+#~ "στο ``tor-win32``."
+
diff --git a/docs/source/locale/en/LC_MESSAGES/install.po b/docs/source/locale/en/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/en/LC_MESSAGES/install.po
+++ b/docs/source/locale/en/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/en/LC_MESSAGES/security.po b/docs/source/locale/en/LC_MESSAGES/security.po
index 725e516e..05816266 100644
--- a/docs/source/locale/en/LC_MESSAGES/security.po
+++ b/docs/source/locale/en/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:43-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/en/LC_MESSAGES/tor.po b/docs/source/locale/en/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/en/LC_MESSAGES/tor.po
+++ b/docs/source/locale/en/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/es/LC_MESSAGES/install.po b/docs/source/locale/es/LC_MESSAGES/install.po
index 217d27b8..a5a17bbb 100644
--- a/docs/source/locale/es/LC_MESSAGES/install.po
+++ b/docs/source/locale/es/LC_MESSAGES/install.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-12-01 17:29+0000\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
 "Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -43,43 +43,42 @@ msgstr "Instalar en Linux"
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 "Hay varias maneras de instalar OnionShare para Linux, pero la recomendada es "
 "usar el paquete `Flatpak <https://flatpak.org/>`_ o bien `Snapcraft "
-"<https://snapcraft.io/>`_. Flatpak y Snapcraft aseguran que siempre usarás "
-"la versión más nueva, y ejecutarás OnionShare dentro de un sandbox."
+"<https://snapcraft.io/>`_. Flatpak y Snap aseguran que siempre usarás la "
+"versión más nueva, y ejecutarás OnionShare dentro de un 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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
-"Snapcraft está encorporado en Ubuntu, y Flatpak en Fedora, pero es a "
-"tuelección cuál usar. Ambos funcionan en todas las distribuciones Linux."
+"Snap está incorporado en Ubuntu, y Flatpak en Fedora, pero es a tu elección "
+"cuál usar. Ambos funcionan en todas las distribuciones Linux."
 
 #: ../../source/install.rst:19
 msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**Instala OnionShare usando Flatpak**: https://flathub.org/apps/details/org."
-"onionshare.OnionShare"
+"**Instala OnionShare usando Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
-msgstr ""
-"**Instala OnionShare usando Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
+msgstr "**Instala OnionShare usando Snap**: https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 "También puedes descargar e instalar paquetes ``.flatpak`` o ``.snap`` "
-"firmados con PGP desde https://onionshare.org/dist/ si lo prefieres."
+"firmados con PGP desde https://onionshare.org/dist/ si así lo prefieres."
 
 #: ../../source/install.rst:28
 msgid "Verifying PGP signatures"
@@ -93,11 +92,11 @@ msgid ""
 "binaries include operating system-specific signatures, and you can just "
 "rely on those alone if you'd like."
 msgstr ""
-"Puedes verificar que el paquete que descargaste sea legítimo y no haya sido "
-"manipulado al verificar su firma PGP. Para Windows y macOS, este paso es "
-"opcional, y provee defensa en profundidad: los ejecutables OnionShare "
-"incluyen firmas específicas del sistema operativo, y puedes confiar solo en "
-"ellas si así lo prefieres."
+"Puedes verificar que el paquete que descargaste sea legítimo y no haya "
+"sido manipulado al verificar su firma PGP. Para Windows y macOS, este "
+"paso es opcional, y provee defensa en profundidad: los ejecutables "
+"OnionShare incluyen firmas específicas del sistema operativo, y puedes "
+"confiar solo en ellas si así lo prefieres."
 
 #: ../../source/install.rst:34
 msgid "Signing key"
@@ -113,9 +112,10 @@ msgid ""
 msgstr ""
 "Los paquetes están firmados por Micah Lee, el desarrollador principal, "
 "usando su clave pública PGP con huella digital "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Puedes descargar la clave de "
-"Micah `desde el servidor de llaves keys.openpgp.org <https://keys.openpgp."
-"org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Puedes descargar la clave "
+"de Micah `desde el servidor de llaves keys.openpgp.org "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 
 #: ../../source/install.rst:38
 msgid ""
@@ -123,9 +123,9 @@ msgid ""
 "probably want `GPGTools <https://gpgtools.org/>`_, and for Windows you "
 "probably want `Gpg4win <https://www.gpg4win.org/>`_."
 msgstr ""
-"Para verificar firmas, debes tener GnuPG instalado. Para macOS probablemente "
-"quieras `GPGTools <https://gpgtools.org/>`_, y para Windows, `Gpg4win "
-"<https://www.gpg4win.org/>`_."
+"Para verificar firmas, debes tener GnuPG instalado. Para macOS "
+"probablemente quieras `GPGTools <https://gpgtools.org/>`_, y para "
+"Windows, `Gpg4win <https://www.gpg4win.org/>`_."
 
 #: ../../source/install.rst:41
 msgid "Signatures"
@@ -133,14 +133,14 @@ msgstr "Firmas"
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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, Flatpak, Snapcraft y el código fuente, en "
+"paquetes para Windows, macOS, Flatpak, Snap 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>`_."
@@ -152,8 +152,8 @@ msgstr "Verificando"
 #: ../../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::"
+"downloaded the binary and and ``.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 "
@@ -171,22 +171,22 @@ msgstr "La salida esperada se parece a esta::"
 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.)"
+"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 no deberías 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.)"
+"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.)"
 
 #: ../../source/install.rst:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 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 "
diff --git a/docs/source/locale/es/LC_MESSAGES/security.po b/docs/source/locale/es/LC_MESSAGES/security.po
index 2a471b77..b35f2a55 100644
--- a/docs/source/locale/es/LC_MESSAGES/security.po
+++ b/docs/source/locale/es/LC_MESSAGES/security.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-12-01 17:29+0000\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
 "Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -48,12 +48,12 @@ msgid ""
 "server for that too. This avoids the traditional model of having to trust"
 " the computers of others."
 msgstr ""
-"**Los terceros no tienen acceso a nada de lo que pasa en OnionShare.** Usar "
-"OnionShare significa alojar servicios directamente en tu computadora. Al "
-"compartir archivos con OnionShare, no son subidos a ningún servidor. Si "
-"creas un cuarto de charla OnionShare, tu computadora también actúa como "
-"servidor para el mismo. Esto evita el modelo tradicional de tener que "
-"confiar en las computadoras de otros."
+"**Los terceros no tienen acceso a nada de lo que pasa en OnionShare.** "
+"Usar OnionShare significa alojar servicios directamente en tu "
+"computadora. Al compartir archivos con OnionShare, no son subidos a "
+"ningún servidor. Si creas un cuarto de charla OnionShare, tu computadora "
+"también actúa como servidor para el mismo. Esto evita el modelo "
+"tradicional de tener que confiar en las computadoras de otros."
 
 #: ../../source/security.rst:13
 msgid ""
@@ -65,13 +65,13 @@ msgid ""
 "Browser with OnionShare's onion service, the traffic is encrypted using "
 "the onion service's private key."
 msgstr ""
-"**Los espías en red no pueden efectuar su actividad en nada de lo que pasa "
-"en tránsito en OnionShare.** La conexión entre el servicio cebolla Tor y el "
-"Navegador Tor es cifrada de extremo a extremo. Esto significa que los "
-"atacantes de red no pueden espiar en nada, excepto tráfico Tor cifrado. Aún "
-"si el espía es un nodo de encuentro malicioso usado para conectar el "
-"Navegador Tor con el servicio cebolla de OnionShare, el tráfico es cifrado "
-"usando la clave privada del servicio cebolla."
+"**Los espías en red no pueden efectuar su actividad en nada de lo que "
+"pasa en tránsito en OnionShare.** La conexión entre el servicio cebolla "
+"Tor y el Navegador Tor es cifrada de extremo a extremo. Esto significa "
+"que los atacantes de red no pueden espiar en nada, excepto tráfico Tor "
+"cifrado. Aún si el espía es un nodo de encuentro malicioso usado para "
+"conectar el Navegador Tor con el servicio cebolla de OnionShare, el "
+"tráfico es cifrado usando la clave privada del servicio cebolla."
 
 #: ../../source/security.rst:15
 msgid ""
@@ -94,8 +94,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -105,9 +105,9 @@ msgstr ""
 "servicios cebolla le permitían al atacante descubrir direcciones .onion "
 "privadas. Si un ataque descubre una dirección OnionShare privada, una "
 "contraseña evitará que la acceda (a menos que el usuario de OnionShare elija "
-"desactivarla y hacerla pública).. La contraseña es generada eligiendo dos "
+"desactivarla y hacerla pública). La contraseña es generada eligiendo dos "
 "palabras aleatorias de una lista de 6800 palabras, lo cual hace 6800^2, o "
-"derca de 46 millones de contraseñas posibles. Solo puede haber 20 "
+"cerca de 46 millones de contraseñas posibles. Solo puede haber 20 "
 "suposiciones equivocadas antes de que OnionShare detenga al servidor, "
 "previniendo ataques por fuerza bruta contra la contraseña."
 
@@ -129,22 +129,22 @@ msgid ""
 msgstr ""
 "**Comunicar la dirección OnionShare podría no ser seguro.** Comunicar la "
 "dirección OnionShare a las personas es la responsibalidad del usuario de "
-"OnionShare. Si es enviada inseguramente (tal como a través de un mensaje de "
-"correo electrónico monitoreado por un atacante), un espía puede inferir que "
-"OnionShare está siendo usado. Si carga la dirección en el Navegador Tor "
-"mientras el servicio todavía está en funcionamiento, puede acceder a él. "
-"Para evitar esto, la dirección debe ser comunicada en forma segura, a través "
-"de un mensaje de texto cifrado (probablemente con mensajes volátiles "
-"habilitados), correo electrónico cifrado o en persona. Esto no es necesario "
-"al usar OnionShare con algo que no es secreto."
+"OnionShare. Si es enviada inseguramente (tal como a través de un mensaje "
+"de correo electrónico monitoreado por un atacante), un espía puede "
+"inferir que OnionShare está siendo usado. Si carga la dirección en el "
+"Navegador Tor mientras el servicio todavía está en funcionamiento, puede "
+"acceder a él. Para evitar esto, la dirección debe ser comunicada en forma"
+" segura, a través de un mensaje de texto cifrado (probablemente con "
+"mensajes volátiles habilitados), correo electrónico cifrado o en persona."
+" Esto no es necesario al usar OnionShare con algo que no es secreto."
 
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 "**Comunicar la dirección OnionShare podría no ser anónimo.** Deben ser "
 "seguidos pasos extra para asegurar que la dirección OnionShare sea "
diff --git a/docs/source/locale/es/LC_MESSAGES/tor.po b/docs/source/locale/es/LC_MESSAGES/tor.po
index c5fcf448..ebf4ad47 100644
--- a/docs/source/locale/es/LC_MESSAGES/tor.po
+++ b/docs/source/locale/es/LC_MESSAGES/tor.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-12-06 00:29+0000\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
 "Last-Translator: Zuhualime Akoochimoya <zakooch@protonmail.ch>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -28,8 +28,8 @@ 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 ""
-"Elige una manera de conectar OnionShare a Tor haciendo clic en el ícono \"⚙\""
-" abajo a la derecha de la ventana OnionShare, para ir a sus ajustes."
+"Elige una manera de conectar OnionShare a Tor haciendo clic en el ícono "
+"\"⚙\" abajo a la derecha de la ventana OnionShare, para ir a sus ajustes."
 
 #: ../../source/tor.rst:9
 msgid "Use the ``tor`` bundled with OnionShare"
@@ -40,9 +40,9 @@ 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 ""
-"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:14
 msgid ""
@@ -51,10 +51,10 @@ msgid ""
 "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 lanza un proceso ``tor`` ya configurado, para "
-"que este lo use en segundo plano. No interfiere con otros procesos ``tor`` "
-"en tu computadora, por lo que puedes usar el Navegador Tor, o el ``tor`` de "
-"sistema, por su cuenta."
+"Cuando abres OnionShare, se lanza un proceso ``tor`` ya configurado, para"
+" que este lo use en segundo plano. No interfiere con otros procesos "
+"``tor`` en tu computadora, por lo que puedes usar el Navegador Tor, o el "
+"``tor`` de sistema, por su cuenta."
 
 #: ../../source/tor.rst:18
 msgid "Attempt auto-configuration with Tor Browser"
@@ -67,10 +67,10 @@ msgid ""
 "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 ""
-"Si `descargaste el Navegador Tor <https://www.torproject.org>`_ y no quieres "
-"dos procesos ``tor`` ejecutándose, puedes usar el proceso ``tor`` del "
-"Navegador Tor. Ten en cuenta que necesitas mantenerlo abierto en segundo "
-"plano mientras estés usando OnionShare para que esto funcione."
+"Si `descargaste el Navegador Tor <https://www.torproject.org>`_ y no "
+"quieres dos procesos ``tor`` ejecutándose, puedes usar el proceso ``tor``"
+" del Navegador Tor. Ten en cuenta que necesitas mantenerlo abierto en "
+"segundo plano mientras estés usando OnionShare para que esto funcione."
 
 #: ../../source/tor.rst:24
 msgid "Using a system ``tor`` in Windows"
@@ -87,14 +87,14 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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, `desde <https://www."
-"torproject.org/download/tor/>`_. Extrae el archivo ZIP y copia la carpeta "
-"extraída a ``C:\\Program Files (x86)\\``. Renómbrala a ``tor-win32``; dentro "
-"de esa carpeta están las subcarpetas ``Data`` y ``Tor``."
+"Descarga el Paquete Experto para Windows de Tor `from <https://www.torproject"
+".org/download/tor/>`_. Extrae el archivo comprimido y copia la carpeta "
+"extracida en ``C:\\Program Files (x86)\\`` Renombra la carpeta extraida con "
+"las subcarpetas ``Data`` y ``Tor`` en ella a ``tor-win32``."
 
 #: ../../source/tor.rst:32
 msgid ""
@@ -106,9 +106,9 @@ msgid ""
 msgstr ""
 "Inventa una contraseña para el puerto de control. (Usar 7 palabras en "
 "secuencia, como ``comprised stumble rummage work avenging construct "
-"volatile`` es una buena idea). Ahora abre una ventana para línea de comando "
-"(``cmd``) como administrador, y usa ``tor.exe --hash-password`` para generar "
-"un hash de tu contraseña. Por ejemplo::"
+"volatile`` es una buena idea). Ahora abre una ventana para línea de "
+"comando (``cmd``) como administrador, y usa ``tor.exe --hash-password`` "
+"para generar un hash de tu contraseña. Por ejemplo::"
 
 #: ../../source/tor.rst:39
 msgid ""
@@ -116,8 +116,8 @@ msgid ""
 "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 el caso del ejemplo de arriba, es "
+"La salida del hash de la contraseña se ve después de algunas advertencias"
+" (que puedes ignorar). En el caso del ejemplo de arriba, es "
 "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
 
 #: ../../source/tor.rst:41
@@ -127,8 +127,8 @@ msgid ""
 "``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:46
 msgid ""
@@ -137,10 +137,11 @@ msgid ""
 "`<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 (como se "
-"describe en `<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_)"
-". De esta manera::"
+"En tu ventana de línea de comando como administrador, instala ``tor`` "
+"como servicio usando el archivo ``torrc`` apropiado que acabas de crear "
+"(como se describe en "
+"`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). De esta"
+" manera::"
 
 #: ../../source/tor.rst:50
 msgid "You are now running a system ``tor`` process in Windows!"
@@ -152,16 +153,16 @@ msgid ""
 "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\"."
+"to the control port password you picked above. Click the \"Test "
+"Connection to Tor\" button. If all goes well, you should see \"Connected "
+"to the Tor controller\"."
 msgstr ""
 "Abre OnionShare y haz clic en el ícono \"⚙\". Bajo \"¿Cómo debería "
 "conectarse OnionShare a Tor?\", elige \"Conectar usando puerto de control\", "
 "y establece \"Puerto de control\" a ``127.0.0.1`` y \"Puerto\" a ``9051``. "
 "Bajo \"Ajustes de autenticación de Tor\", elige \"Contraseña\", y "
 "establécela a la contraseña para el puerto de control que elegiste arriba. "
-"haz clic en el botón \"Probar Conexión a Tor\". Si todo va bien, deberías "
+"Haz clic en el botón \"Probar Conexión a Tor\". Si todo va bien, deberías "
 "ver \"Conectado al controlador Tor\"."
 
 #: ../../source/tor.rst:61
@@ -171,10 +172,10 @@ msgstr "Usar un ``tor`` de sistema en macOS"
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 "Primero, instala `Homebrew <http://brew.sh/>`_ si es que todavía no lo "
-"tienes. Luego, instala Tor::"
+"tienes, y luego instala Tor::"
 
 #: ../../source/tor.rst:67
 msgid "Now configure Tor to allow connections from OnionShare::"
@@ -193,10 +194,11 @@ msgid ""
 "cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 "Abre OnionShare y haz clic en el ícono \"⚙\". Bajo \"¿Cómo debería "
-"conectarse OnionShare a Tor?\", elige \"Conectar usando un archivo socket\", "
-"y establece el mismo a ``/usr/local/var/run/tor/control.socket``. Bajo "
-"\"Ajustes de autenticación de Tor\", elige \"Sin autenticación, o "
-"autenticación por cookies\". Haz clic en el botón \"Probar Conexión a Tor\"."
+"conectarse OnionShare a Tor?\", elige \"Conectar usando un archivo "
+"socket\", y establece el mismo a "
+"``/usr/local/var/run/tor/control.socket``. Bajo \"Ajustes de "
+"autenticación de Tor\", elige \"Sin autenticación, o autenticación por "
+"cookies\". Haz clic en el botón \"Probar Conexión a Tor\"."
 
 #: ../../source/tor.rst:84 ../../source/tor.rst:104
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
@@ -213,9 +215,10 @@ msgid ""
 "`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, es recomendado usar el `repositorio oficial "
-"<https://support.torproject.org/apt/tor-deb-repo/>`_ del Tor Project."
+"Primero, instala el paquete ``tor``. Si estás usando Debian, Ubuntu o una"
+" distribución de Linux similar, es recomendado usar el `repositorio "
+"oficial <https://support.torproject.org/apt/tor-deb-repo/>`_ del Tor "
+"Project."
 
 #: ../../source/tor.rst:91
 msgid ""
@@ -223,9 +226,9 @@ msgid ""
 "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."
+"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:93
 msgid ""
@@ -244,11 +247,12 @@ msgid ""
 "\"No authentication, or cookie authentication\". Click the \"Test "
 "Connection to Tor\" button."
 msgstr ""
-"Reinicia tu computadora. Luego del arranque, abre OnionShare y haz clic en "
-"el ícono \"⚙\". Bajo \"¿Cómo debería conectarse OnionShare a Tor?\", elige "
-"\"Conectar usando un archivo socket\". Establécelo a ``/var/run/tor/control``"
-". Bajo \"Ajustes de autenticación de tor\", elige \"Sin autenticación, o "
-"autenticación por cookies\". Haz clic en el botón \"Probar Conexión a Tor\"."
+"Reinicia tu computadora. Luego del arranque, abre OnionShare y haz clic "
+"en el ícono \"⚙\". Bajo \"¿Cómo debería conectarse OnionShare a Tor?\", "
+"elige \"Conectar usando un archivo socket\". Establécelo a "
+"``/var/run/tor/control``. Bajo \"Ajustes de autenticación de tor\", elige"
+" \"Sin autenticación, o autenticación por cookies\". Haz clic en el botón"
+" \"Probar Conexión a Tor\"."
 
 #: ../../source/tor.rst:107
 msgid "Using Tor bridges"
@@ -261,10 +265,10 @@ msgid ""
 "<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 ""
-"Si tu 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."
+"Si tu 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:111
 msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
@@ -278,9 +282,9 @@ msgid ""
 "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 `"
-"BridgeDB <https://bridges.torproject.org/>`_ de Tor. Si necesitas usar un "
-"puente, intenta primero con los obfs4 incorporados."
+"incorporados, o puentes personalizados, los cuales puedes obtener de la "
+"`BridgeDB <https://bridges.torproject.org/>`_ de Tor. Si necesitas usar "
+"un puente, intenta primero con los obfs4 incorporados."
 
 #~ msgid "Using a system Tor in Mac OS X"
 #~ msgstr "Usando un Tor de sistema en macOS"
@@ -422,3 +426,21 @@ msgstr ""
 #~ "Ajustes\". Si todo va bien, debieras "
 #~ "ver que se conectó exitosamente a "
 #~ "Tor."
+
+#~ 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 ""
+#~ "Descarga el Paquete Experto de Tor "
+#~ "para Windows, `desde "
+#~ "<https://www.torproject.org/download/tor/>`_. Extrae el"
+#~ " archivo ZIP y copia la carpeta "
+#~ "extraída a ``C:\\Program Files (x86)\\``. "
+#~ "Renómbrala a ``tor-win32``; dentro de"
+#~ " esa carpeta están las subcarpetas "
+#~ "``Data`` y ``Tor``."
diff --git a/docs/source/locale/fa/LC_MESSAGES/install.po b/docs/source/locale/fa/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/fa/LC_MESSAGES/install.po
+++ b/docs/source/locale/fa/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/fa/LC_MESSAGES/security.po b/docs/source/locale/fa/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/fa/LC_MESSAGES/security.po
+++ b/docs/source/locale/fa/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/fa/LC_MESSAGES/tor.po b/docs/source/locale/fa/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/fa/LC_MESSAGES/tor.po
+++ b/docs/source/locale/fa/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/fr/LC_MESSAGES/install.po b/docs/source/locale/fr/LC_MESSAGES/install.po
index 9d749a71..0b3e8463 100644
--- a/docs/source/locale/fr/LC_MESSAGES/install.po
+++ b/docs/source/locale/fr/LC_MESSAGES/install.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language: fr\n"
@@ -40,15 +40,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -58,12 +58,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -106,10 +106,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -120,8 +120,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -136,17 +136,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -264,3 +264,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/fr/LC_MESSAGES/security.po b/docs/source/locale/fr/LC_MESSAGES/security.po
index a2f639e0..a8cbadeb 100644
--- a/docs/source/locale/fr/LC_MESSAGES/security.po
+++ b/docs/source/locale/fr/LC_MESSAGES/security.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language: fr\n"
@@ -71,8 +71,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -98,10 +98,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -211,3 +211,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/fr/LC_MESSAGES/tor.po b/docs/source/locale/fr/LC_MESSAGES/tor.po
index 2acb44fc..dd76b26d 100644
--- a/docs/source/locale/fr/LC_MESSAGES/tor.po
+++ b/docs/source/locale/fr/LC_MESSAGES/tor.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-20 17:28+0000\n"
 "Last-Translator: Localisation Lab <ao@localizationlab.org>\n"
-"Language-Team: none\n"
 "Language: fr\n"
+"Language-Team: none\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/tor.rst:2
@@ -28,8 +27,9 @@ 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 ""
-"Choisissez une façon de connecter OnionShare à Tor en cliquant sur l’icône ⚙ "
-"en bas à droite de la fenêtre d’OnionShare pour accéder à ses paramètres."
+"Choisissez une façon de connecter OnionShare à Tor en cliquant sur "
+"l’icône ⚙ en bas à droite de la fenêtre d’OnionShare pour accéder à ses "
+"paramètres."
 
 #: ../../source/tor.rst:9
 msgid "Use the ``tor`` bundled with OnionShare"
@@ -51,10 +51,11 @@ msgid ""
 "with other ``tor`` processes on your computer, so you can use the Tor "
 "Browser or the system ``tor`` on their own."
 msgstr ""
-"Quand vous ouvrez OnionShare, il lance en arrière-plan un processus ``tor`` "
-"déjà configuré pour qu’OnionShare puisse l’utiliser. Cela n’interfère pas "
-"avec d’autres processus ``tor`` sur votre ordinateur, et vous pouvez donc "
-"utiliser indépendamment le Navigateur Tor ou le ``tor`` du système."
+"Quand vous ouvrez OnionShare, il lance en arrière-plan un processus "
+"``tor`` déjà configuré pour qu’OnionShare puisse l’utiliser. Cela "
+"n’interfère pas avec d’autres processus ``tor`` sur votre ordinateur, et "
+"vous pouvez donc utiliser indépendamment le Navigateur Tor ou le ``tor`` "
+"du système."
 
 #: ../../source/tor.rst:18
 msgid "Attempt auto-configuration with Tor Browser"
@@ -67,11 +68,12 @@ msgid ""
 "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 ""
-"Si vous avez `téléchargé le Navigateur Tor <https://www.torproject.org/fr/>`"
-"_ et que vous ne voulez pas que deux processus ``tor`` s’exécutent, vous "
-"pouvez utiliser le processus ``tor`` du Navigateur Tor. Gardez à l’esprit "
-"que le Navigateur Tor doit être ouvert en arrière-plan pendant que vous "
-"utilisez OnionShare pour que cette approche fonctionne."
+"Si vous avez `téléchargé le Navigateur Tor "
+"<https://www.torproject.org/fr/>`_ et que vous ne voulez pas que deux "
+"processus ``tor`` s’exécutent, vous pouvez utiliser le processus ``tor`` "
+"du Navigateur Tor. Gardez à l’esprit que le Navigateur Tor doit être "
+"ouvert en arrière-plan pendant que vous utilisez OnionShare pour que "
+"cette approche fonctionne."
 
 #: ../../source/tor.rst:24
 msgid "Using a system ``tor`` in Windows"
@@ -82,21 +84,17 @@ msgid ""
 "This is fairly advanced. You'll need to know how edit plaintext files and"
 " do stuff as an administrator."
 msgstr ""
-"C’est une opération assez compliquée. Vous devrez savoir comment modifier "
-"des fichiers en texte brut et effectuer des opérations en tant "
+"C’est une opération assez compliquée. Vous devrez savoir comment modifier"
+" des fichiers en texte brut et effectuer des opérations en tant "
 "qu’administrateur."
 
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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 ""
-"Téléchargez l’Offre groupée Expert Windows `de <https://www.torproject.org/"
-"fr/download/tor/>`_. Extrayez le fichier ZIP et copiez dans ``C:\\Program "
-"Files (x86)\\`` le dossier extrait. Renommez en ``tor-win32`` le dossier "
-"extrait qui comprend ``Data`` et ``Tor``."
 
 #: ../../source/tor.rst:32
 msgid ""
@@ -106,11 +104,12 @@ msgid ""
 "administrator, and use ``tor.exe --hash-password`` to generate a hash of "
 "your password. For example::"
 msgstr ""
-"Trouvez un mot de passe pour le port de contrôle (une séquence de sept mots "
-"tels que ``comprise trébucher fouiller travailler vengeresse construire "
-"volatile`` est une bonne idée de mot de passe). Ouvrez maintenant une invite "
-"de commande (``cmd``) en tant qu’administrateur et utilisé ``tor.exe --hash-"
-"password`` pour générer une empreinte de votre mot de passe. Par exemple :"
+"Trouvez un mot de passe pour le port de contrôle (une séquence de sept "
+"mots tels que ``comprise trébucher fouiller travailler vengeresse "
+"construire volatile`` est une bonne idée de mot de passe). Ouvrez "
+"maintenant une invite de commande (``cmd``) en tant qu’administrateur et "
+"utilisé ``tor.exe --hash-password`` pour générer une empreinte de votre "
+"mot de passe. Par exemple :"
 
 #: ../../source/tor.rst:39
 msgid ""
@@ -130,9 +129,9 @@ msgid ""
 "``HashedControlPassword`` with the one you just generated::"
 msgstr ""
 "Créez maintenant un nouveau fichier texte ``C:\\Program Files (x86)\\tor-"
-"win32\\torrc`` et placez-y l’empreinte de votre mot de passe en remplaçant "
-"la valeur ``HashedControlPassword`` par l’empreinte que vous venez de "
-"générer :"
+"win32\\torrc`` et placez-y l’empreinte de votre mot de passe en "
+"remplaçant la valeur ``HashedControlPassword`` par l’empreinte que vous "
+"venez de générer :"
 
 #: ../../source/tor.rst:46
 msgid ""
@@ -152,9 +151,9 @@ msgid ""
 "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\"."
+"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:61
@@ -164,14 +163,14 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
 msgid "Now configure Tor to allow connections from OnionShare::"
 msgstr ""
-"Maintenant, configurez Tor pour permettre les connexions à partir d’"
-"OnionShare ::"
+"Maintenant, configurez Tor pour permettre les connexions à partir "
+"d’OnionShare ::"
 
 #: ../../source/tor.rst:74
 msgid "And start the system Tor service::"
@@ -186,12 +185,12 @@ msgid ""
 "cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 "Ouvrez OnionShare et cliquez sur l’icône ⚙. Sous « Comment OnionShare "
-"devrait-il se connecter à Tor ? », choisissez « Se connecter en utilisant un "
-"fichier d’interface de connexion », et définissez ``/usr/local/var/run/tor/"
-"control.socket`` comme fichier d’interface de connexion. Sous « Paramètres d’"
-"authentification de Tor », choisissez « Pas d’authentification, ou "
-"authentification par témoin ». Cliquez sur le bouton « Tester la connexion à "
-"Tor »."
+"devrait-il se connecter à Tor ? », choisissez « Se connecter en utilisant"
+" un fichier d’interface de connexion », et définissez "
+"``/usr/local/var/run/tor/control.socket`` comme fichier d’interface de "
+"connexion. Sous « Paramètres d’authentification de Tor », choisissez « "
+"Pas d’authentification, ou authentification par témoin ». Cliquez sur le "
+"bouton « Tester la connexion à Tor »."
 
 #: ../../source/tor.rst:84 ../../source/tor.rst:104
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
@@ -456,3 +455,43 @@ msgstr ""
 #~ "to use a bridge, you should try"
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
+
+#~ 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 ""
+#~ "Téléchargez l’Offre groupée Expert Windows "
+#~ "`de <https://www.torproject.org/fr/download/tor/>`_. "
+#~ "Extrayez le fichier ZIP et copiez "
+#~ "dans ``C:\\Program Files (x86)\\`` le "
+#~ "dossier extrait. Renommez en ``tor-"
+#~ "win32`` le dossier extrait qui comprend"
+#~ " ``Data`` et ``Tor``."
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/ga/LC_MESSAGES/install.po b/docs/source/locale/ga/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/ga/LC_MESSAGES/install.po
+++ b/docs/source/locale/ga/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/ga/LC_MESSAGES/security.po b/docs/source/locale/ga/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/ga/LC_MESSAGES/security.po
+++ b/docs/source/locale/ga/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/ga/LC_MESSAGES/tor.po b/docs/source/locale/ga/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/ga/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ga/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/hr/LC_MESSAGES/advanced.po b/docs/source/locale/hr/LC_MESSAGES/advanced.po
new file mode 100644
index 00000000..431c5891
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/advanced.po
@@ -0,0 +1,133 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-15 14:54-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/advanced.rst:2
+msgid "Advanced Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:7
+msgid "Save Tabs"
+msgstr ""
+
+#: ../../source/advanced.rst:9
+msgid "Everything in OnionShare is temporary by default. If you close an OnionShare tab, its address no longer exists and it can't be used again. Sometimes you might want an OnionShare service to be persistent. This is useful if you want to host a website available from the same OnionShare address even if you reboot your computer."
+msgstr ""
+
+#: ../../source/advanced.rst:13
+msgid "To make any tab persistent, check the \"Save this tab, and automatically open it when I open OnionShare\" box before starting the server. When a tab is saved a purple pin icon appears to the left of its server status."
+msgstr ""
+
+#: ../../source/advanced.rst:18
+msgid "When you quit OnionShare and then open it again, your saved tabs will start opened. You'll have to manually start each service, but when you do they will start with the same OnionShare address and password."
+msgstr ""
+
+#: ../../source/advanced.rst:21
+msgid "If you save a tab, a copy of that tab's onion service secret key will be stored on your computer with your OnionShare settings."
+msgstr ""
+
+#: ../../source/advanced.rst:26
+msgid "Turn Off Passwords"
+msgstr ""
+
+#: ../../source/advanced.rst:28
+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 "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 "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:38
+msgid "Scheduled Times"
+msgstr ""
+
+#: ../../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: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: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 "**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:56
+msgid "Command-line Interface"
+msgstr ""
+
+#: ../../source/advanced.rst:58
+msgid "In addition to its graphical interface, OnionShare has a command-line interface."
+msgstr ""
+
+#: ../../source/advanced.rst:60
+msgid "You can install just the command-line version of OnionShare using ``pip3``::"
+msgstr ""
+
+#: ../../source/advanced.rst:64
+msgid "Note that you will also need the ``tor`` package installed. In macOS, install it with: ``brew install tor``"
+msgstr ""
+
+#: ../../source/advanced.rst:66
+msgid "Then run it like this::"
+msgstr ""
+
+#: ../../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:73
+msgid "Usage"
+msgstr ""
+
+#: ../../source/advanced.rst:75
+msgid "You can browse the command-line documentation by running ``onionshare --help``::"
+msgstr ""
+
+#: ../../source/advanced.rst:132
+msgid "Legacy Addresses"
+msgstr ""
+
+#: ../../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: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: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: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: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/source/locale/hr/LC_MESSAGES/develop.po b/docs/source/locale/hr/LC_MESSAGES/develop.po
new file mode 100644
index 00000000..9c0c51de
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/develop.po
@@ -0,0 +1,125 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-15 14:54-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/develop.rst:2
+msgid "Developing OnionShare"
+msgstr ""
+
+#: ../../source/develop.rst:7
+msgid "Collaborating"
+msgstr ""
+
+#: ../../source/develop.rst:9
+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: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:15
+msgid "Contributing Code"
+msgstr ""
+
+#: ../../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: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: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 "Starting Development"
+msgstr ""
+
+#: ../../source/develop.rst:29
+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 "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:35
+msgid "Debugging tips"
+msgstr ""
+
+#: ../../source/develop.rst:38
+msgid "Verbose mode"
+msgstr ""
+
+#: ../../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: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: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:124
+msgid "Local Only"
+msgstr ""
+
+#: ../../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:164
+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:167
+msgid "Contributing Translations"
+msgstr ""
+
+#: ../../source/develop.rst:169
+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 "To help translate, make a Hosted Weblate account and start contributing."
+msgstr ""
+
+#: ../../source/develop.rst:174
+msgid "Suggestions for Original English Strings"
+msgstr ""
+
+#: ../../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 "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 "Status of Translations"
+msgstr ""
+
+#: ../../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/source/locale/hr/LC_MESSAGES/features.po b/docs/source/locale/hr/LC_MESSAGES/features.po
new file mode 100644
index 00000000..ee9e83f5
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/features.po
@@ -0,0 +1,226 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-15 14:54-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/features.rst:4
+msgid "How OnionShare Works"
+msgstr ""
+
+#: ../../source/features.rst:6
+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::"
+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 unencrypted e-mail, depending on your `threat model <https://ssd.eff.org/module/your-security-plan>`_."
+msgstr ""
+
+#: ../../source/features.rst:14
+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 "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 info."
+msgstr ""
+
+#: ../../source/features.rst:21
+msgid "Share Files"
+msgstr ""
+
+#: ../../source/features.rst:23
+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: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 "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: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: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: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: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:47
+msgid "Receive Files"
+msgstr ""
+
+#: ../../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: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 "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:60
+msgid "Here is what it looks like for someone sending you files."
+msgstr ""
+
+#: ../../source/features.rst:64
+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: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 "Use at your own risk"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../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 "Tips for running a receive service"
+msgstr ""
+
+#: ../../source/features.rst:78
+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: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 "Host a Website"
+msgstr ""
+
+#: ../../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 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: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 "Content Security Policy"
+msgstr ""
+
+#: ../../source/features.rst:100
+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: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 "Tips for running a website service"
+msgstr ""
+
+#: ../../source/features.rst:107
+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: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: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: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: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: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: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:139
+msgid "How is this useful?"
+msgstr ""
+
+#: ../../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: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
+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:150
+msgid "How does the encryption work?"
+msgstr ""
+
+#: ../../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: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/source/locale/hr/LC_MESSAGES/help.po b/docs/source/locale/hr/LC_MESSAGES/help.po
new file mode 100644
index 00000000..71a6803e
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/help.po
@@ -0,0 +1,53 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-15 14:54-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/help.rst:2
+msgid "Getting Help"
+msgstr ""
+
+#: ../../source/help.rst:5
+msgid "Read This Website"
+msgstr ""
+
+#: ../../source/help.rst:7
+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:10
+msgid "Check the GitHub Issues"
+msgstr ""
+
+#: ../../source/help.rst:12
+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:15
+msgid "Submit an Issue Yourself"
+msgstr ""
+
+#: ../../source/help.rst:17
+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:20
+msgid "Join our Keybase Team"
+msgstr ""
+
+#: ../../source/help.rst:22
+msgid "See :ref:`collaborating` on how to join the Keybase team used to discuss the project."
+msgstr ""
diff --git a/docs/source/locale/hr/LC_MESSAGES/index.po b/docs/source/locale/hr/LC_MESSAGES/index.po
new file mode 100644
index 00000000..711a4da0
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/index.po
@@ -0,0 +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.
+#
+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:46-0700\n"
+"PO-Revision-Date: 2020-12-17 19:29+0000\n"
+"Last-Translator: Milo Ivir <mail@milotype.de>\n"
+"Language-Team: none\n"
+"Language: hr\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.4-dev\n"
+
+#: ../../source/index.rst:2
+msgid "OnionShare's documentation"
+msgstr "OnionShare dokumentacija"
+
+#: ../../source/index.rst:6
+msgid "OnionShare is an open source tool that lets you securely and anonymously share files, host websites, and chat with friends using the Tor network."
+msgstr ""
+"OnionShare je alat otvorenog koda koji omogućuje sigurno i anonimno "
+"dijeljenje datoteka, hosting za web-stranice te čavrljanje s prijateljima "
+"pomoću mreže Tor."
diff --git a/docs/source/locale/hr/LC_MESSAGES/install.po b/docs/source/locale/hr/LC_MESSAGES/install.po
new file mode 100644
index 00000000..1b304e45
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/install.po
@@ -0,0 +1,105 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/install.rst:2
+msgid "Installation"
+msgstr ""
+
+#: ../../source/install.rst:5
+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:12
+msgid "Install in Linux"
+msgstr ""
+
+#: ../../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 `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure that you'll always use the newest version and run OnionShare inside of a sandbox."
+msgstr ""
+
+#: ../../source/install.rst:17
+msgid "Snap support is built-in to Ubuntu and Fedora comes with Flatpak support, but which you use is up to you. Both work in all Linux distributions."
+msgstr ""
+
+#: ../../source/install.rst:19
+msgid "**Install OnionShare using Flatpak**: https://flathub.org/apps/details/org.onionshare.OnionShare"
+msgstr ""
+
+#: ../../source/install.rst:21
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
+msgstr ""
+
+#: ../../source/install.rst:23
+msgid "You can also download and install 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: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: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:41
+msgid "Signatures"
+msgstr ""
+
+#: ../../source/install.rst:43
+msgid "You can find the signatures (as ``.asc`` files), as well as Windows, macOS, Flatpak, Snap, 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:47
+msgid "Verifying"
+msgstr ""
+
+#: ../../source/install.rst:49
+msgid "Once you have imported Micah's public key into your GnuPG keychain, downloaded the binary and and ``.asc`` signature, you can verify the binary for macOS in a terminal like this::"
+msgstr ""
+
+#: ../../source/install.rst:53
+msgid "Or for Windows, in a command-prompt like this::"
+msgstr ""
+
+#: ../../source/install.rst:57
+msgid "The expected output looks like this::"
+msgstr ""
+
+#: ../../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:71
+msgid "If you want to learn more about verifying PGP signatures, the guides for `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ and the `Tor Project <https://support.torproject.org/tbb/how-to-verify-signature/>`_ may be useful."
+msgstr ""
diff --git a/docs/source/locale/hr/LC_MESSAGES/security.po b/docs/source/locale/hr/LC_MESSAGES/security.po
new file mode 100644
index 00000000..36647c1c
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/security.po
@@ -0,0 +1,61 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/security.rst:2
+msgid "Security Design"
+msgstr ""
+
+#: ../../source/security.rst:4
+msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
+msgstr ""
+
+#: ../../source/security.rst:6
+msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
+msgstr ""
+
+#: ../../source/security.rst:9
+msgid "What OnionShare protects against"
+msgstr ""
+
+#: ../../source/security.rst:11
+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.** 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."
+msgstr ""
+
+#: ../../source/security.rst:17
+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², 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
+msgid "What OnionShare doesn't protect against"
+msgstr ""
+
+#: ../../source/security.rst:22
+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.** Extra precautions must be taken to ensure the OnionShare address is communicated anonymously. A new email or chat account, only accessed over Tor, can be used to share the address. This isn't necessary unless anonymity is a goal."
+msgstr ""
diff --git a/docs/source/locale/hr/LC_MESSAGES/sphinx.po b/docs/source/locale/hr/LC_MESSAGES/sphinx.po
new file mode 100644
index 00000000..2a00df65
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/sphinx.po
@@ -0,0 +1,28 @@
+# 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.
+#
+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"
+"PO-Revision-Date: 2020-12-17 19:29+0000\n"
+"Last-Translator: Milo Ivir <mail@milotype.de>\n"
+"Language-Team: none\n"
+"Language: hr\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.4-dev\n"
+
+#: ../../source/_templates/versions.html:10
+msgid "Versions"
+msgstr "Verzije"
+
+#: ../../source/_templates/versions.html:18
+msgid "Languages"
+msgstr "Jezici"
diff --git a/docs/source/locale/hr/LC_MESSAGES/tor.po b/docs/source/locale/hr/LC_MESSAGES/tor.po
new file mode 100644
index 00000000..bf737f5d
--- /dev/null
+++ b/docs/source/locale/hr/LC_MESSAGES/tor.po
@@ -0,0 +1,142 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/tor.rst:2
+msgid "Connecting to Tor"
+msgstr ""
+
+#: ../../source/tor.rst:4
+msgid "Pick a way to connect OnionShare to Tor by clicking the \"⚙\" icon in the bottom right of the OnionShare window to get to its settings."
+msgstr ""
+
+#: ../../source/tor.rst:9
+msgid "Use the ``tor`` bundled with OnionShare"
+msgstr ""
+
+#: ../../source/tor.rst:11
+msgid "This is the default, simplest and most reliable way that OnionShare connects to Tor. For this reason, it's recommended for most users."
+msgstr ""
+
+#: ../../source/tor.rst:14
+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:18
+msgid "Attempt auto-configuration with Tor Browser"
+msgstr ""
+
+#: ../../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:24
+msgid "Using a system ``tor`` in Windows"
+msgstr ""
+
+#: ../../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:28
+msgid "Download the Tor Windows Expert Bundle `from <https://www.torproject.org/download/tor/>`_. Extract the compressed 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: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: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: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: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:50
+msgid "You are now running a system ``tor`` process in Windows!"
+msgstr ""
+
+#: ../../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:61
+msgid "Using a system ``tor`` in macOS"
+msgstr ""
+
+#: ../../source/tor.rst:63
+msgid "First, install `Homebrew <https://brew.sh/>`_ if you don't already have it, and then install Tor::"
+msgstr ""
+
+#: ../../source/tor.rst:67
+msgid "Now configure Tor to allow connections from OnionShare::"
+msgstr ""
+
+#: ../../source/tor.rst:74
+msgid "And start the system Tor service::"
+msgstr ""
+
+#: ../../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:87
+msgid "Using a system ``tor`` in Linux"
+msgstr ""
+
+#: ../../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: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:93
+msgid "Add your user to the ``debian-tor`` group by running this command (replace ``username`` with your actual username)::"
+msgstr ""
+
+#: ../../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:107
+msgid "Using Tor bridges"
+msgstr ""
+
+#: ../../source/tor.rst:109
+msgid "If your access to the Internet is censored, you can configure OnionShare to connect to the Tor network using `Tor bridges <https://2019.www.torproject.org/docs/bridges.html.en>`_. If OnionShare connects to Tor without one, you don't need to use a bridge."
+msgstr ""
+
+#: ../../source/tor.rst:111
+msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
+msgstr ""
+
+#: ../../source/tor.rst:113
+msgid "You can use the built-in obfs4 pluggable transports, the built-in meek_lite (Azure) pluggable transports, or custom bridges, which you can obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you need to use a bridge, try the built-in obfs4 ones first."
+msgstr ""
diff --git a/docs/source/locale/is/LC_MESSAGES/install.po b/docs/source/locale/is/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/is/LC_MESSAGES/install.po
+++ b/docs/source/locale/is/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/is/LC_MESSAGES/security.po b/docs/source/locale/is/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/is/LC_MESSAGES/security.po
+++ b/docs/source/locale/is/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/is/LC_MESSAGES/tor.po b/docs/source/locale/is/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/is/LC_MESSAGES/tor.po
+++ b/docs/source/locale/is/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/it/LC_MESSAGES/install.po b/docs/source/locale/it/LC_MESSAGES/install.po
index 8275b1f3..8a586739 100644
--- a/docs/source/locale/it/LC_MESSAGES/install.po
+++ b/docs/source/locale/it/LC_MESSAGES/install.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-12-02 19:29+0000\n"
 "Last-Translator: x <hardwired1.0@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
+"Language-Team: it <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/install.rst:2
@@ -32,20 +31,21 @@ msgid ""
 "You can download OnionShare for Windows and macOS from the `OnionShare "
 "website <https://onionshare.org/>`_."
 msgstr ""
-"Puoi scaricare OnionShare per Windows e macOS dal `sito web di OnionShare "
-"<https://onionshare.org/>`_."
+"Puoi scaricare OnionShare per Windows e macOS dal `sito web di OnionShare"
+" <https://onionshare.org/>`_."
 
 #: ../../source/install.rst:12
 msgid "Install in Linux"
 msgstr "Installa su Linux"
 
 #: ../../source/install.rst:14
+#, fuzzy
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 "Ci sono diversi modi per installare OnionShare su Linux, ma il modo "
 "suggerito è usare o il pacchetto di `Flatpak <https://flatpak.org/>`_ o "
@@ -54,33 +54,35 @@ msgstr ""
 "OnionShare all'interno di una sandbox."
 
 #: ../../source/install.rst:17
+#, fuzzy
 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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
-"Snapcraft è integrato in Ubuntu e Flatpak è integrato in Fedora, ma quale "
-"scegliere dipende da te. Entrambi funzionano in tutte le distro Linux."
+"Snapcraft è integrato in Ubuntu e Flatpak è integrato in Fedora, ma quale"
+" scegliere dipende da te. Entrambi funzionano in tutte le distro Linux."
 
 #: ../../source/install.rst:19
 msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**Installa OnionShare usando Flatpak**: https://flathub.org/apps/details/org."
-"onionshare.OnionShare"
+"**Installa OnionShare usando Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
-msgstr ""
-"**Installa OnionShare usando Snapcraft**: https://snapcraft.io/onionshare"
+#, fuzzy
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
+msgstr "**Installa OnionShare usando Snapcraft**: https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
+#, fuzzy
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
-"Se preferisci puoi anche scaricare e installare pacchetti con firma PGP ``."
-"flatpak`` o ``.snap`` da https://onionshare.org/dist/."
+"Se preferisci puoi anche scaricare e installare pacchetti con firma PGP "
+"``.flatpak`` o ``.snap`` da https://onionshare.org/dist/."
 
 #: ../../source/install.rst:28
 msgid "Verifying PGP signatures"
@@ -96,9 +98,9 @@ msgid ""
 msgstr ""
 "Puoi verificare che il pacchetto scaricato sia legittimo e non sia stato "
 "manomesso verificando la sua firma PGP. Per Windows e macOS, questo "
-"passaggio è facoltativo e fornisce una difesa approfondita: i file binari "
-"OnionShare includono firme specifiche del sistema operativo e se lo vuoi "
-"puoi semplicemente fare affidamento su quelle da sole."
+"passaggio è facoltativo e fornisce una difesa approfondita: i file binari"
+" OnionShare includono firme specifiche del sistema operativo e se lo vuoi"
+" puoi semplicemente fare affidamento su quelle da sole."
 
 #: ../../source/install.rst:34
 #, fuzzy
@@ -115,9 +117,10 @@ msgid ""
 msgstr ""
 "I pacchetti sono firmati da Micah Lee, lo sviluppatore principale, "
 "utilizzando la sua chiave pubblica PGP con impronta digitale "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Puoi scaricare la chiave di "
-"Micah `dal server delle chiavi keys.openpgp.org <https://keys.openpgp.org/"
-"vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Puoi scaricare la chiave di"
+" Micah `dal server delle chiavi keys.openpgp.org "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 
 #: ../../source/install.rst:38
 msgid ""
@@ -126,40 +129,43 @@ msgid ""
 "probably want `Gpg4win <https://www.gpg4win.org/>`_."
 msgstr ""
 "Per verificare le firme, è necessario che tu abbia installato GnuPG. Per "
-"macOS è probabilmente necessario `GPGTools <https://gpgtools.org/>`_, e per "
-"Windows è probabilmente necessario `Gpg4win <https://www.gpg4win.org/>`_."
+"macOS è probabilmente necessario `GPGTools <https://gpgtools.org/>`_, e "
+"per Windows è probabilmente necessario `Gpg4win "
+"<https://www.gpg4win.org/>`_."
 
 #: ../../source/install.rst:41
 msgid "Signatures"
 msgstr "Firme"
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
-"Puoi trovare le firme (file ``.asc``), così come i pacchetti sorrgente per "
-"Windows, macOS, Flatpak e Snapcraft su https://onionshare.org/dist/ nelle "
-"cartelle denominate per ogni versione di OnionShare. Puoi anche trovarli "
-"nella pagina `GitHub Releases page <https://github.com/micahflee/onionshare/"
-"releases>`_."
+"Puoi trovare le firme (file ``.asc``), così come i pacchetti sorrgente "
+"per Windows, macOS, Flatpak e Snapcraft su https://onionshare.org/dist/ "
+"nelle cartelle denominate per ogni versione di OnionShare. Puoi anche "
+"trovarli nella pagina `GitHub Releases page "
+"<https://github.com/micahflee/onionshare/releases>`_."
 
 #: ../../source/install.rst:47
 msgid "Verifying"
 msgstr "Verifica in corso"
 
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 "Dopo aver importato la chiave pubblica di Micah nel portachiavi GnuPG, "
-"scaricato il binario e scaricato la firma ``.asc``, è possibile verificare "
-"il binario per macOS in un terminale come questo::"
+"scaricato il binario e scaricato la firma ``.asc``, è possibile "
+"verificare il binario per macOS in un terminale come questo::"
 
 #: ../../source/install.rst:53
 msgid "Or for Windows, in a command-prompt like this::"
@@ -170,30 +176,32 @@ msgid "The expected output looks like this::"
 msgstr "Il risultato atteso somiglia a questo::"
 
 #: ../../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.)"
+"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 ""
 "Se non viene visualizzato 'Good signature from', potrebbe verificarsi un "
-"problema con l'integrità del file (dannoso o meno) e non dovresti installare "
-"il pacchetto. (L'AVVISO mostrato sopra, non è un problema con il pacchetto: "
-"significa solo che non hai già definito alcun livello di 'fiducia' della "
-"chiave PGP di Micah.)"
+"problema con l'integrità del file (dannoso o meno) e non dovresti "
+"installare il pacchetto. (L'AVVISO mostrato sopra, non è un problema con "
+"il pacchetto: significa solo che non hai già definito alcun livello di "
+"'fiducia' della chiave PGP di Micah.)"
 
 #: ../../source/install.rst:71
+#, fuzzy
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 "Se volete saperne di più sulla verifica delle firme PGP, possono essere "
-"utili le guide per `Qubes OS <https://www.qubes-os.org/security/"
-"verifying-signatures/>`_ e il `Progetto Tor <https://support.torproject.org/"
-"it/tbb/how-to-verify-signature//>`_."
+"utili le guide per `Qubes OS <https://www.qubes-os.org/security"
+"/verifying-signatures/>`_ e il `Progetto Tor "
+"<https://support.torproject.org/it/tbb/how-to-verify-signature//>`_."
 
 #~ msgid "Install on Windows or macOS"
 #~ msgstr ""
@@ -309,3 +317,4 @@ msgstr ""
 #~ "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 4afc1e4b..8e117cc9 100644
--- a/docs/source/locale/it/LC_MESSAGES/security.po
+++ b/docs/source/locale/it/LC_MESSAGES/security.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-12-01 17:29+0000\n"
 "Last-Translator: x <hardwired1.0@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
+"Language-Team: it <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/security.rst:2
@@ -31,8 +30,7 @@ msgstr ""
 
 #: ../../source/security.rst:6
 msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
-msgstr ""
-"Come tutti i software, OnionShare potrebbe contenere bug o vulnerabilità."
+msgstr "Come tutti i software, OnionShare potrebbe contenere bug o vulnerabilità."
 
 #: ../../source/security.rst:9
 msgid "What OnionShare protects against"
@@ -51,8 +49,8 @@ msgstr ""
 "L'utilizzo di OnionShare significa ospitare servizi direttamente sul "
 "computer. Quando si condividono file con OnionShare, questi non vengono "
 "caricati su alcun server. Se si crea una chat room con OnionShare, il "
-"computer funge da server anche per questo. Ciò evita il modello tradizionale "
-"di doversi fidare dei computer degli altri."
+"computer funge da server anche per questo. Ciò evita il modello "
+"tradizionale di doversi fidare dei computer degli altri."
 
 #: ../../source/security.rst:13
 msgid ""
@@ -64,13 +62,14 @@ msgid ""
 "Browser with OnionShare's onion service, the traffic is encrypted using "
 "the onion service's private key."
 msgstr ""
-"**Gli intercettatori di rete non possono spiare nulla di ciò che accade in "
-"OnionShare in transito.** La connessione tra il servizio Tor onion e Tor "
-"Browser è crittografata end-to-end. Ciò significa che gli aggressori di rete "
-"non possono intercettare nulla tranne il traffico Tor crittografato. Anche "
-"se un intercettore è un nodo di rendezvous dannoso utilizzato per collegare "
-"il browser Tor con il servizio onion di OnionShare, il traffico viene "
-"crittografato utilizzando la chiave privata del servizio onion."
+"**Gli intercettatori di rete non possono spiare nulla di ciò che accade "
+"in OnionShare in transito.** La connessione tra il servizio Tor onion e "
+"Tor Browser è crittografata end-to-end. Ciò significa che gli aggressori "
+"di rete non possono intercettare nulla tranne il traffico Tor "
+"crittografato. Anche se un intercettore è un nodo di rendezvous dannoso "
+"utilizzato per collegare il browser Tor con il servizio onion di "
+"OnionShare, il traffico viene crittografato utilizzando la chiave privata"
+" del servizio onion."
 
 #: ../../source/security.rst:15
 msgid ""
@@ -80,35 +79,37 @@ msgid ""
 "Browser users, the Tor Browser users and eavesdroppers can't learn the "
 "identity of the OnionShare user."
 msgstr ""
-"**L'anonimato degli utenti di OnionShare è protetto da Tor.** OnionShare e "
-"Tor Browser proteggono l'anonimato degli utenti. Finché l'utente di "
-"OnionShare comunica in modo anonimo l'indirizzo OnionShare con gli utenti di "
-"Tor Browser, gli utenti e gli intercettatori di Tor Browser non possono "
-"apprendere l'identità dell'utente di OnionShare."
+"**L'anonimato degli utenti di OnionShare è protetto da Tor.** OnionShare "
+"e Tor Browser proteggono l'anonimato degli utenti. Finché l'utente di "
+"OnionShare comunica in modo anonimo l'indirizzo OnionShare con gli utenti"
+" di Tor Browser, gli utenti e gli intercettatori di Tor Browser non "
+"possono apprendere l'identità dell'utente di OnionShare."
 
 #: ../../source/security.rst:17
+#, fuzzy
 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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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 ""
-"**Se un utente malintenzionato viene a conoscenza del servizio onion, non "
-"può comunque accedere a nulla.** Gli attacchi precedenti contro la rete Tor "
-"per enumerare i servizi onion hanno consentito all'utente malintenzionato di "
-"individuare indirizzi onion privati. Se un attacco rileva un indirizzo "
-"OnionShare privato, una password impedirà loro di accedervi (a meno che "
-"l'utente OnionShare non scelga di disattivarlo e renderlo pubblico).. La "
-"password viene generata scegliendo due parole casuali da un elenco di 6800 "
-"parole, rendendo 6800^2 o circa 46 milioni di password possibili. Solo 20 "
-"ipotesi errate possono essere fatte prima che OnionShare fermi il server, "
-"prevenendo attacchi di forza bruta contro la password."
+"**Se un utente malintenzionato viene a conoscenza del servizio onion, non"
+" può comunque accedere a nulla.** Gli attacchi precedenti contro la rete "
+"Tor per enumerare i servizi onion hanno consentito all'utente "
+"malintenzionato di individuare indirizzi onion privati. Se un attacco "
+"rileva un indirizzo OnionShare privato, una password impedirà loro di "
+"accedervi (a meno che l'utente OnionShare non scelga di disattivarlo e "
+"renderlo pubblico).. La password viene generata scegliendo due parole "
+"casuali da un elenco di 6800 parole, rendendo 6800^2 o circa 46 milioni "
+"di password possibili. Solo 20 ipotesi errate possono essere fatte prima "
+"che OnionShare fermi il server, prevenendo attacchi di forza bruta contro"
+" la password."
 
 #: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
@@ -126,30 +127,33 @@ msgid ""
 " disappearing messages enabled), encrypted email, or in person. This "
 "isn't necessary when using OnionShare for something that isn't secret."
 msgstr ""
-"**Comunicare l'indirizzo OnionShare potrebbe non essere sicuro.** Comunicare "
-"l'indirizzo OnionShare agli utenti è responsabilità dell'utente di "
-"OnionShare. Se inviato in modo non sicuro (ad esempio tramite un messaggio "
-"di posta elettronica monitorato da un utente malintenzionato), un "
-"intercettore può sapere che si sta utilizzato OnionShare. Se l'intercettore "
-"carica l'indirizzo in Tor Browser mentre il servizio è ancora in funzione, "
-"può accedervi. Per evitare questo, l'indirizzo deve essere comunicato in "
-"modo sicuro, tramite sms crittografati (probabilmente con i messaggi a "
-"scomparsa abilitati), email crittografate o di persona. Questo non è "
-"necessario quando si utilizza OnionShare per qualcosa che non è segreto."
+"**Comunicare l'indirizzo OnionShare potrebbe non essere sicuro.** "
+"Comunicare l'indirizzo OnionShare agli utenti è responsabilità "
+"dell'utente di OnionShare. Se inviato in modo non sicuro (ad esempio "
+"tramite un messaggio di posta elettronica monitorato da un utente "
+"malintenzionato), un intercettore può sapere che si sta utilizzato "
+"OnionShare. Se l'intercettore carica l'indirizzo in Tor Browser mentre il"
+" servizio è ancora in funzione, può accedervi. Per evitare questo, "
+"l'indirizzo deve essere comunicato in modo sicuro, tramite sms "
+"crittografati (probabilmente con i messaggi a scomparsa abilitati), email"
+" crittografate o di persona. Questo non è necessario quando si utilizza "
+"OnionShare per qualcosa che non è segreto."
 
 #: ../../source/security.rst:24
+#, fuzzy
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
-"**Comunicare l'indirizzo di OnionShare potrebbe non essere anonimo.** Devono "
-"essere effettuati step ulteriori per garantire che l'indirizzo OnionShare "
-"sia comunicato in maniera anonima. Per condividerlo si possono utilizzare "
-"una nuova mail o un nuovo account di chat, a cui si accede solo via Tor. "
-"Questo non è necessario a meno che l'anonimato non sia un tuo obiettivo."
+"**Comunicare l'indirizzo di OnionShare potrebbe non essere anonimo.** "
+"Devono essere effettuati step ulteriori per garantire che l'indirizzo "
+"OnionShare sia comunicato in maniera anonima. Per condividerlo si possono"
+" utilizzare una nuova mail o un nuovo account di chat, a cui si accede "
+"solo via Tor. Questo non è necessario a meno che l'anonimato non sia un "
+"tuo obiettivo."
 
 #~ msgid "Security design"
 #~ msgstr ""
@@ -257,3 +261,4 @@ msgstr ""
 #~ "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 4267f2e9..6cc41484 100644
--- a/docs/source/locale/it/LC_MESSAGES/tor.po
+++ b/docs/source/locale/it/LC_MESSAGES/tor.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-12-02 19:29+0000\n"
 "Last-Translator: x <hardwired1.0@protonmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
+"Language-Team: it <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/tor.rst:2
@@ -28,9 +27,9 @@ 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 ""
-"Scegli un modo per collegare OnionShare a Tor cliccando l'icona \"⚙\" nella "
-"parte inferiore destra della finestra di OnionShare per raggiungere le "
-"impostazioni."
+"Scegli un modo per collegare OnionShare a Tor cliccando l'icona \"⚙\" "
+"nella parte inferiore destra della finestra di OnionShare per raggiungere"
+" le impostazioni."
 
 #: ../../source/tor.rst:9
 msgid "Use the ``tor`` bundled with OnionShare"
@@ -41,9 +40,9 @@ 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 ""
-"Questo è il modo predefinito, più semplice e affidabile in cui OnionShare si "
-"connette a Tor. Per questo motivo, è consigliato per la maggior parte degli "
-"utenti."
+"Questo è il modo predefinito, più semplice e affidabile in cui OnionShare"
+" si connette a Tor. Per questo motivo, è consigliato per la maggior parte"
+" degli utenti."
 
 #: ../../source/tor.rst:14
 msgid ""
@@ -68,10 +67,10 @@ msgid ""
 "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 ""
-"Se hai `scaricato il Browser Tor <https://www.torproject.org/it/>`_ e non "
-"vuoi che due processi ``tor`` siano in esecuzione, puoi usare il processo `` "
-"tor`` dal Browser Tor. Tieni presente che devi tenere il Browser Tor aperto "
-"in background mentre usi OnionShare affinché funzioni."
+"Se hai `scaricato il Browser Tor <https://www.torproject.org/it/>`_ e non"
+" vuoi che due processi ``tor`` siano in esecuzione, puoi usare il "
+"processo `` tor`` dal Browser Tor. Tieni presente che devi tenere il "
+"Browser Tor aperto in background mentre usi OnionShare affinché funzioni."
 
 #: ../../source/tor.rst:24
 msgid "Using a system ``tor`` in Windows"
@@ -82,20 +81,16 @@ msgid ""
 "This is fairly advanced. You'll need to know how edit plaintext files and"
 " do stuff as an administrator."
 msgstr ""
-"Questo è abbastanza avanzato. Avrai bisogno di sapere come modificare i file "
-"di testo in chiaro e fare cose come amministratore."
+"Questo è abbastanza avanzato. Avrai bisogno di sapere come modificare i "
+"file di testo in chiaro e fare cose come amministratore."
 
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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 ""
-"Scarica Tor Windows Expert Bundle `da <https://www.torproject.org/it/"
-"download/tor/>`_. Estrai il file ZIP e copia la cartella estratta in ``C:"
-"\\Programmi(x86)\\`` Rinomina la cartella estratta con ``Dati`` e `` Tor`` "
-"in ``tor-win32``."
 
 #: ../../source/tor.rst:32
 msgid ""
@@ -105,11 +100,11 @@ msgid ""
 "administrator, and use ``tor.exe --hash-password`` to generate a hash of "
 "your password. For example::"
 msgstr ""
-"Crea una password per la porta di controllo. (Usare 7 parole in una sequenza "
-"come ``comprised stumble rummage work avenging construct volatile`` è una "
-"buona idea per una password.) Ora apri un prompt dei comandi (``cmd``) come "
-"amministratore e usa ``tor. exe --hash-password`` per generare un hash della "
-"tua password. Per esempio::"
+"Crea una password per la porta di controllo. (Usare 7 parole in una "
+"sequenza come ``comprised stumble rummage work avenging construct "
+"volatile`` è una buona idea per una password.) Ora apri un prompt dei "
+"comandi (``cmd``) come amministratore e usa ``tor. exe --hash-password`` "
+"per generare un hash della tua password. Per esempio::"
 
 #: ../../source/tor.rst:39
 msgid ""
@@ -117,8 +112,8 @@ msgid ""
 "can ignore). In the case of the above example, it is "
 "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
 msgstr ""
-"L'output della password con l'hash viene visualizzato dopo alcuni avvisi ("
-"che è possibile ignorare). Nel caso dell'esempio precedente, è "
+"L'output della password con l'hash viene visualizzato dopo alcuni avvisi "
+"(che è possibile ignorare). Nel caso dell'esempio precedente, è "
 "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
 
 #: ../../source/tor.rst:41
@@ -127,8 +122,8 @@ msgid ""
 "win32\\torrc`` and put your hashed password output in it, replacing the "
 "``HashedControlPassword`` with the one you just generated::"
 msgstr ""
-"Ora crea un nuovo file di testo in ``C:\\Programmi(x86)\\tor-win32\\torrc '' "
-"e inseriscici l'output della password con l'hash, sostituendo "
+"Ora crea un nuovo file di testo in ``C:\\Programmi(x86)\\tor-win32\\torrc"
+" '' e inseriscici l'output della password con l'hash, sostituendo "
 "``HashedControlPassword`` con quello appena generato:"
 
 #: ../../source/tor.rst:46
@@ -138,8 +133,9 @@ msgid ""
 "`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
 "this::"
 msgstr ""
-"Nel prompt dei comandi dell'amministratore, installa ``tor`` come servizio "
-"utilizzando il file ``torrc`` appropriato appena creato (come descritto in "
+"Nel prompt dei comandi dell'amministratore, installa ``tor`` come "
+"servizio utilizzando il file ``torrc`` appropriato appena creato (come "
+"descritto in "
 "`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Come "
 "questo::"
 
@@ -148,34 +144,37 @@ msgid "You are now running a system ``tor`` process in Windows!"
 msgstr "Ora stai eseguendo un processo di sistema ``tor`` su Windows!"
 
 #: ../../source/tor.rst:52
+#, fuzzy
 msgid ""
 "Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
 "OnionShare connect to Tor?\" choose \"Connect using control port\", and "
 "set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
 "\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above Click the \"Test Connection"
-" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
-" controller\"."
+"to the control port password you picked above. Click the \"Test "
+"Connection to Tor\" button. If all goes well, you should see \"Connected "
+"to the Tor controller\"."
 msgstr ""
 "Apri OnionShare e fai clic sull'icona \"⚙\" al suo interno. In \"Come "
-"dovrebbe OnionShare connettersi a Tor?\" scegli \"Connetti utilizzando la "
-"porta di controllo\" e imposta \"Porta di controllo\" su \"127.0.0.1\" e "
-"\"Porta\" su \"9051\". In \"Impostazioni di autenticazione Tor\" scegli "
-"\"Password\" e imposta la password sulla password della porta di controllo "
-"che hai scelto sopra. Fai clic sul pulsante \"Prova connessione a Tor\". Se "
-"tutto va bene, dovresti vedere \"Connesso al controller di Tor\"."
+"dovrebbe OnionShare connettersi a Tor?\" scegli \"Connetti utilizzando la"
+" porta di controllo\" e imposta \"Porta di controllo\" su \"127.0.0.1\" e"
+" \"Porta\" su \"9051\". In \"Impostazioni di autenticazione Tor\" scegli "
+"\"Password\" e imposta la password sulla password della porta di "
+"controllo che hai scelto sopra. Fai clic sul pulsante \"Prova connessione"
+" a Tor\". Se tutto va bene, dovresti vedere \"Connesso al controller di "
+"Tor\"."
 
 #: ../../source/tor.rst:61
 msgid "Using a system ``tor`` in macOS"
 msgstr "Utilizzando un sistema ``tor`` su macOS"
 
 #: ../../source/tor.rst:63
+#, fuzzy
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
-"Innanzitutto, installa `Homebrew <https://brew.sh/index_it>`_ se non lo hai "
-"già. Quindi, installa Tor::"
+"Innanzitutto, installa `Homebrew <https://brew.sh/index_it>`_ se non lo "
+"hai già. Quindi, installa Tor::"
 
 #: ../../source/tor.rst:67
 msgid "Now configure Tor to allow connections from OnionShare::"
@@ -194,11 +193,11 @@ msgid ""
 "cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 "Apri OnionShare e fai clic sull'icona \"⚙\" al suo interno. In \"Come "
-"dovrebbe OnionShare connettersi a Tor?\" scegli \"Connetti usando il file "
-"socket\" e imposta il file socket come ``/usr/local/var/run/tor/control."
-"socket``. In \"Impostazioni di autenticazione di Tor\" scegli \"Nessuna "
-"autenticazione o autenticazione cookie\". Fai clic sul pulsante \"Prova "
-"connessione a Tor\"."
+"dovrebbe OnionShare connettersi a Tor?\" scegli \"Connetti usando il file"
+" socket\" e imposta il file socket come "
+"``/usr/local/var/run/tor/control.socket``. In \"Impostazioni di "
+"autenticazione di Tor\" scegli \"Nessuna autenticazione o autenticazione "
+"cookie\". Fai clic sul pulsante \"Prova connessione a Tor\"."
 
 #: ../../source/tor.rst:84 ../../source/tor.rst:104
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
@@ -215,10 +214,10 @@ msgid ""
 "`official repository <https://support.torproject.org/apt/tor-deb-"
 "repo/>`_."
 msgstr ""
-"Innanzitutto, installa il pacchetto ``tor``. Se stai usando Debian, Ubuntu o "
-"una distribuzione Linux simile, si consiglia di utilizzare il `repository "
-"ufficiale del progetto Tor <https://support.torproject.org/it/apt/"
-"tor-deb-repo/>`_."
+"Innanzitutto, installa il pacchetto ``tor``. Se stai usando Debian, "
+"Ubuntu o una distribuzione Linux simile, si consiglia di utilizzare il "
+"`repository ufficiale del progetto Tor "
+"<https://support.torproject.org/it/apt/tor-deb-repo/>`_."
 
 #: ../../source/tor.rst:91
 msgid ""
@@ -227,16 +226,17 @@ msgid ""
 "connect to your system ``tor``'s control socket file."
 msgstr ""
 "Successivamente, aggiungi il tuo utente al gruppo che esegue il processo "
-"``tor`` (nel caso di Debian e Ubuntu, ``debian-tor``) e configura OnionShare "
-"per connettersi al file socket di controllo del tuo sistema ``tor``."
+"``tor`` (nel caso di Debian e Ubuntu, ``debian-tor``) e configura "
+"OnionShare per connettersi al file socket di controllo del tuo sistema "
+"``tor``."
 
 #: ../../source/tor.rst:93
 msgid ""
 "Add your user to the ``debian-tor`` group by running this command "
 "(replace ``username`` with your actual username)::"
 msgstr ""
-"Aggiungi il tuo utente al gruppo ``debian-tor`` eseguendo questo comando ("
-"sostituisci ``username`` con il tuo nome utente effettivo):"
+"Aggiungi il tuo utente al gruppo ``debian-tor`` eseguendo questo comando "
+"(sostituisci ``username`` con il tuo nome utente effettivo):"
 
 #: ../../source/tor.rst:97
 msgid ""
@@ -247,12 +247,12 @@ msgid ""
 "\"No authentication, or cookie authentication\". Click the \"Test "
 "Connection to Tor\" button."
 msgstr ""
-"Riavvia il computer. Dopo il riavvio, apri OnionShare e fai clic sull'icona "
-"\"⚙\" al suo interno. In \"Come dovrebbe OnionShare connettersi a Tor?\" "
-"scegli \"Connetti tramite file socket\". Imposta il file socket come ``/var/"
-"run/tor/control``. In \"Impostazioni di autenticazione di Tor\" scegli "
-"\"Nessuna autenticazione o autenticazione cookie\". Fai clic sul pulsante "
-"\"Prova connessione a Tor\"."
+"Riavvia il computer. Dopo il riavvio, apri OnionShare e fai clic "
+"sull'icona \"⚙\" al suo interno. In \"Come dovrebbe OnionShare "
+"connettersi a Tor?\" scegli \"Connetti tramite file socket\". Imposta il "
+"file socket come ``/var/run/tor/control``. In \"Impostazioni di "
+"autenticazione di Tor\" scegli \"Nessuna autenticazione o autenticazione "
+"cookie\". Fai clic sul pulsante \"Prova connessione a Tor\"."
 
 #: ../../source/tor.rst:107
 msgid "Using Tor bridges"
@@ -265,10 +265,11 @@ msgid ""
 "<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 ""
-"Se il tuo accesso a Internet è censurato, puoi configurare OnionShare per "
-"connettersi alla rete Tor utilizzando `i bridge di Tor<https://2019.www."
-"torproject.org/docs/bridges.html.en>`_. Se OnionShare si connette a Tor "
-"senza uno, non è necessario utilizzare un bridge."
+"Se il tuo accesso a Internet è censurato, puoi configurare OnionShare per"
+" connettersi alla rete Tor utilizzando `i bridge di "
+"Tor<https://2019.www.torproject.org/docs/bridges.html.en>`_. Se "
+"OnionShare si connette a Tor senza uno, non è necessario utilizzare un "
+"bridge."
 
 #: ../../source/tor.rst:111
 msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
@@ -282,10 +283,10 @@ msgid ""
 "need to use a bridge, try the built-in obfs4 ones first."
 msgstr ""
 "È possibile utilizzare i trasporti collegabili obfs4 incorporati, i "
-"trasporti collegabili meek_lite (Azure) incorporati o bridge personalizzati, "
-"che è possibile ottenere da `BridgeDB <https://bridges.torproject.org/"
-"?lang=it>`_ di Tor. Se hai bisogno di usare un bridge, prova prima quelli "
-"incorporati obfs4."
+"trasporti collegabili meek_lite (Azure) incorporati o bridge "
+"personalizzati, che è possibile ottenere da `BridgeDB "
+"<https://bridges.torproject.org/?lang=it>`_ di Tor. Se hai bisogno di "
+"usare un bridge, prova prima quelli incorporati obfs4."
 
 #~ msgid "Using a system Tor in Mac OS X"
 #~ msgstr ""
@@ -487,3 +488,20 @@ msgstr ""
 #~ "to use a bridge, you should try"
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
+
+#~ 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 ""
+#~ "Scarica Tor Windows Expert Bundle `da"
+#~ " <https://www.torproject.org/it/download/tor/>`_. Estrai "
+#~ "il file ZIP e copia la cartella"
+#~ " estratta in ``C:\\Programmi(x86)\\`` Rinomina"
+#~ " la cartella estratta con ``Dati`` e"
+#~ " `` Tor`` in ``tor-win32``."
+
diff --git a/docs/source/locale/ja/LC_MESSAGES/install.po b/docs/source/locale/ja/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/ja/LC_MESSAGES/install.po
+++ b/docs/source/locale/ja/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/ja/LC_MESSAGES/security.po b/docs/source/locale/ja/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/ja/LC_MESSAGES/security.po
+++ b/docs/source/locale/ja/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/ja/LC_MESSAGES/tor.po b/docs/source/locale/ja/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/ja/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ja/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/nb_NO/LC_MESSAGES/install.po b/docs/source/locale/nb_NO/LC_MESSAGES/install.po
index 79fc88bd..b361918f 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/install.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/install.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-19 08:28+0000\n"
 "Last-Translator: Kurt Eilertsen <kurt@kheds.com>\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-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/install.rst:2
@@ -32,30 +31,33 @@ msgid ""
 "You can download OnionShare for Windows and macOS from the `OnionShare "
 "website <https://onionshare.org/>`_."
 msgstr ""
-"Du kan laste ned OnionShare for Windows og macOS fra `OnionShare-nettsiden "
-"<https://onionshare.org/>`_."
+"Du kan laste ned OnionShare for Windows og macOS fra `OnionShare-"
+"nettsiden <https://onionshare.org/>`_."
 
 #: ../../source/install.rst:12
 msgid "Install in Linux"
 msgstr "Installasjon på Linux"
 
 #: ../../source/install.rst:14
+#, fuzzy
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
-"Det er forskjellige måter å installere OnionShare i Linux, men den anbefalte "
-"måten er å enten bruke `Flatpak <https://flatpak.org/>`_ eller `Snapcraft "
-"<https://snapcraft.io/>`_-pakken. Flatpak og Snapcraft sørger for at du "
-"alltid har den nyeste versjonen, og kjører OnionShare i en sandkasse."
+"Det er forskjellige måter å installere OnionShare i Linux, men den "
+"anbefalte måten er å enten bruke `Flatpak <https://flatpak.org/>`_ eller "
+"`Snapcraft <https://snapcraft.io/>`_-pakken. Flatpak og Snapcraft sørger "
+"for at du alltid har den nyeste versjonen, og kjører OnionShare i en "
+"sandkasse."
 
 #: ../../source/install.rst:17
+#, fuzzy
 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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 "Ubuntu kommer med Snapcraft og Fedora kommer med Flatpak, men hvilken du "
 "bruker er opptil deg. Begge fungerer i alle Linux-distribusjoner."
@@ -65,22 +67,25 @@ msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**Installasjon av OnionShare ved bruk av Flatpak**: https://flathub.org/apps/"
-"details/org.onionshare.OnionShare"
+"**Installasjon av OnionShare ved bruk av Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#, fuzzy
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
-"**Installer OnionSHare ved burk av Snapcraft**: https://snapcraft.io/"
-"onionshare"
+"**Installer OnionSHare ved burk av Snapcraft**: "
+"https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
+#, fuzzy
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
-"Du kan også laste ned og installere PGP-signerte ``.flatpak`` eller ``."
-"snap``-pakker fra https://onionshare.org/dist/ hvis du foretrekker det."
+"Du kan også laste ned og installere PGP-signerte ``.flatpak`` eller "
+"``.snap``-pakker fra https://onionshare.org/dist/ hvis du foretrekker "
+"det."
 
 #: ../../source/install.rst:28
 msgid "Verifying PGP signatures"
@@ -94,11 +99,11 @@ msgid ""
 "binaries include operating system-specific signatures, and you can just "
 "rely on those alone if you'd like."
 msgstr ""
-"Du kan bekrefte at pakken du lastet ned er legitim og har ikke blitt tuklet "
-"med ved å bekrefte dens PGP-signatur. For Windows og macOS er dette steget "
-"valgfritt og tilbyr dyptgående forsvar: OnionShare-binærfilen har "
-"operativsystem-spesifikke signaturer, og du kan bare stole på dem hvis du "
-"ønsker det."
+"Du kan bekrefte at pakken du lastet ned er legitim og har ikke blitt "
+"tuklet med ved å bekrefte dens PGP-signatur. For Windows og macOS er "
+"dette steget valgfritt og tilbyr dyptgående forsvar: OnionShare-"
+"binærfilen har operativsystem-spesifikke signaturer, og du kan bare stole"
+" på dem hvis du ønsker det."
 
 #: ../../source/install.rst:34
 msgid "Signing key"
@@ -112,11 +117,12 @@ msgid ""
 "<https://keys.openpgp.org/vks/v1/by-"
 "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 msgstr ""
-"Pakker signeres av Micah Lee, hovedutvikleren, ved bruk av en offentlig PGP-"
-"nøkkel som har fingeravtrykket ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. "
-"Du kan laste ned Micah sin nøkkel fra `from the keys.openpgp.org keyserver "
-"<https://keys.openpgp.org/vks/v1/by-fingerprint/"
-"927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Pakker signeres av Micah Lee, hovedutvikleren, ved bruk av en offentlig "
+"PGP-nøkkel som har fingeravtrykket "
+"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Du kan laste ned Micah sin "
+"nøkkel fra `from the keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 
 #: ../../source/install.rst:38
 msgid ""
@@ -125,39 +131,43 @@ msgid ""
 "probably want `Gpg4win <https://www.gpg4win.org/>`_."
 msgstr ""
 "Du må ha GnuPG installert for å bekrefte signaturer. For macOS vil du "
-"antagelig ønske å bruke `GPGTools <https://gpgtools.org/>`_, og for Windows "
-"vil du antagelig ønske å bruke `Gpg4win <https://www.gpg4win.org/>`_."
+"antagelig ønske å bruke `GPGTools <https://gpgtools.org/>`_, og for "
+"Windows vil du antagelig ønske å bruke `Gpg4win "
+"<https://www.gpg4win.org/>`_."
 
 #: ../../source/install.rst:41
 msgid "Signatures"
 msgstr "Signaturer"
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 "Du finner signaturene (``.asc`` files), såvel som, macOS, Flatpak, "
 "Snapcraft, og kildepakker, på https://onionshare.org/dist/ i mappene "
-"navngitt for hver versjon av OnionShare. Du kan også finne dem på `GitHub-"
-"utgivelsessiden <https://github.com/micahflee/onionshare/releases>`_."
+"navngitt for hver versjon av OnionShare. Du kan også finne dem på "
+"`GitHub-utgivelsessiden "
+"<https://github.com/micahflee/onionshare/releases>`_."
 
 #: ../../source/install.rst:47
 msgid "Verifying"
 msgstr "Bekreftelse"
 
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 "Når du har importert Micah sin offentlige nøkkel inn i ditt GnuPG-"
-"nøkkelknippe, lastet ned binærfilen, og lastet ned ``.asc``-signaturen, kan "
-"du bekrefte den kjørbare binærfilen for macOS i en terminal slik::"
+"nøkkelknippe, lastet ned binærfilen, og lastet ned ``.asc``-signaturen, "
+"kan du bekrefte den kjørbare binærfilen for macOS i en terminal slik::"
 
 #: ../../source/install.rst:53
 msgid "Or for Windows, in a command-prompt like this::"
@@ -168,29 +178,31 @@ msgid "The expected output looks like this::"
 msgstr "Forventet utdata ser slik ut::"
 
 #: ../../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.)"
+"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 ""
-"Hvis du ikke ser «God signatur fra» er det kanskje et problem med filen ("
-"ondsinnet eller av annen årsak), og du bør ikke installere pakken. (ADVARSEL "
-"vist ovenfor er ikke et problem med pakken; det betyr kun at du ikke "
-"allerede har etablert et tillits-nivå til Micah sin PGP-nøkkel."
+"Hvis du ikke ser «God signatur fra» er det kanskje et problem med filen "
+"(ondsinnet eller av annen årsak), og du bør ikke installere pakken. "
+"(ADVARSEL vist ovenfor er ikke et problem med pakken; det betyr kun at du"
+" ikke allerede har etablert et tillits-nivå til Micah sin PGP-nøkkel."
 
 #: ../../source/install.rst:71
+#, fuzzy
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 "Hvis du ønsker å lære mer om bekrefting av PGP-singaturer, finnes det en "
-"veiledning for `Qubes OS <https://www.qubes-os.org/security/"
-"verifying-signatures/>`_ og `Tor Project <https://support.torproject.org/tbb/"
-"how-to-verify-signature/>`_."
+"veiledning for `Qubes OS <https://www.qubes-os.org/security/verifying-"
+"signatures/>`_ og `Tor Project <https://support.torproject.org/tbb/how-"
+"to-verify-signature/>`_."
 
 #~ msgid "Install on Windows or macOS"
 #~ msgstr ""
@@ -306,3 +318,4 @@ msgstr ""
 #~ "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 6d08de09..5f3a36b8 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/security.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/security.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-19 08:28+0000\n"
 "Last-Translator: Kurt Eilertsen <kurt@kheds.com>\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-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/security.rst:2
@@ -25,8 +24,7 @@ msgstr "Sikkerhetsdesign"
 
 #: ../../source/security.rst:4
 msgid "Read :ref:`how_it_works` first to get a handle on how OnionShare works."
-msgstr ""
-"Les :ref:`how_it_works` først for å få taket på hvordan OnionShare virker."
+msgstr "Les :ref:`how_it_works` først for å få taket på hvordan OnionShare virker."
 
 #: ../../source/security.rst:6
 msgid "Like all software, OnionShare may contain bugs or vulnerabilities."
@@ -45,11 +43,12 @@ msgid ""
 "server for that too. This avoids the traditional model of having to trust"
 " the computers of others."
 msgstr ""
-"**Tredjeparter har ikke tilgang til noe som skjer i OnionShare.** Bruk av "
-"OnionShare betyr vertstjening av tjenester direkte på din datamaskin. Når du "
-"deler filer med OnionShare, lastes de ikke opp til noen tjener. Hvis du "
-"lager et OnionShare-sludrerom, fungerer datamaskinen din som tjener for det "
-"også. Dette unngår den tradisjonelle tiltro til andres datamaskiner-modellen."
+"**Tredjeparter har ikke tilgang til noe som skjer i OnionShare.** Bruk av"
+" OnionShare betyr vertstjening av tjenester direkte på din datamaskin. "
+"Når du deler filer med OnionShare, lastes de ikke opp til noen tjener. "
+"Hvis du lager et OnionShare-sludrerom, fungerer datamaskinen din som "
+"tjener for det også. Dette unngår den tradisjonelle tiltro til andres "
+"datamaskiner-modellen."
 
 #: ../../source/security.rst:13
 msgid ""
@@ -61,12 +60,13 @@ msgid ""
 "Browser with OnionShare's onion service, the traffic is encrypted using "
 "the onion service's private key."
 msgstr ""
-"**Nettverkstyvlyttere kan ikke spionere på noe som skjer i OnionShare under "
-"forsendelse.** Tilkoblingen mellom Tor-onion tjenesten og Tor-nettleseren er "
-"ende-til-ende -kryptert. Dette betyr at nettverksangripere ikke kan tyvlytte "
-"til noe annet enn kryptert Tor-trafikk. Selv om en tyvlytter er en ondsinnet "
-"løsrevet node brukt til å koble til Tor-nettlesren med OnionShare sin onion "
-"tjeneste, er trafikken kryptert med onion tjenestens private nøkkel."
+"**Nettverkstyvlyttere kan ikke spionere på noe som skjer i OnionShare "
+"under forsendelse.** Tilkoblingen mellom Tor-onion tjenesten og Tor-"
+"nettleseren er ende-til-ende -kryptert. Dette betyr at nettverksangripere"
+" ikke kan tyvlytte til noe annet enn kryptert Tor-trafikk. Selv om en "
+"tyvlytter er en ondsinnet løsrevet node brukt til å koble til Tor-"
+"nettlesren med OnionShare sin onion tjeneste, er trafikken kryptert med "
+"onion tjenestens private nøkkel."
 
 #: ../../source/security.rst:15
 msgid ""
@@ -76,34 +76,36 @@ msgid ""
 "Browser users, the Tor Browser users and eavesdroppers can't learn the "
 "identity of the OnionShare user."
 msgstr ""
-"**Anonymiteten til OnionShare-brukere er beskyttet av Tor.** OnionShare og "
-"Tor-nettlesren beskytter anonymiteten til alle brukerne. Så lenge en Onion-"
-"bruker kommuniserer OnionShare-adressen anonymt med brukere av Tor-"
+"**Anonymiteten til OnionShare-brukere er beskyttet av Tor.** OnionShare "
+"og Tor-nettlesren beskytter anonymiteten til alle brukerne. Så lenge en "
+"Onion-bruker kommuniserer OnionShare-adressen anonymt med brukere av Tor-"
 "nettleseren, vil Tor-nettleseren og tyvlyttere ikke kunne ta rede på "
 "OnionShare-brukerens identitet."
 
 #: ../../source/security.rst:17
+#, fuzzy
 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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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 ""
-"**Hvis en angriper lærer om løktjenesten, har den fremdeles ikke tilgang til "
-"noe.** Tidligere angrep mot Tor-nettverket for å telle opp løktjenestene lot "
-"kun angriperen oppdage private .onion-adresser. Hvis en angriper oppdager en "
-"privat OnionShare-adresse, vil et passord beskytte dem fra å få tilgang til "
-"den (med mindre OnionShare-brukeren velger å skru den av, og gjøre den "
-"offentlig). Passordet genereres ved å velge to tilfeldige ord fra en liste "
-"med 6800 ord, noe som betyr 6800^2, eller omtrent 46 millioner mulige "
-"passord. Kun 20 feilaktige forsøk tillates før OnionShare stopper tjeneren, "
-"noe som forhindrer totalsøks-angrep mot possordet."
+"**Hvis en angriper lærer om løktjenesten, har den fremdeles ikke tilgang "
+"til noe.** Tidligere angrep mot Tor-nettverket for å telle opp "
+"løktjenestene lot kun angriperen oppdage private .onion-adresser. Hvis en"
+" angriper oppdager en privat OnionShare-adresse, vil et passord beskytte "
+"dem fra å få tilgang til den (med mindre OnionShare-brukeren velger å "
+"skru den av, og gjøre den offentlig). Passordet genereres ved å velge to "
+"tilfeldige ord fra en liste med 6800 ord, noe som betyr 6800^2, eller "
+"omtrent 46 millioner mulige passord. Kun 20 feilaktige forsøk tillates "
+"før OnionShare stopper tjeneren, noe som forhindrer totalsøks-angrep mot "
+"possordet."
 
 #: ../../source/security.rst:20
 msgid "What OnionShare doesn't protect against"
@@ -121,29 +123,31 @@ msgid ""
 " disappearing messages enabled), encrypted email, or in person. This "
 "isn't necessary when using OnionShare for something that isn't secret."
 msgstr ""
-"**Å kommunisere OnionShare-adressen er ikke nødvendigvis sikkert.** Å dele "
-"OnionShare-adressen til folk er OnionShare-brukerens ansvar. Hvis den sendes "
-"usikkert (som gjennom en e-postmelding som holdes oppsyn med av en angriper)"
-", kan en tyvlytter ta rede på at OnionShare blir brukt. Hvis tyvlytteren "
-"laster inn adressen i Tor-nettleseren mens tjenesten fremdeles er oppe, kan "
-"vedkommende få tilgang til den. For å unngå dette, må adressen kommuniseres "
-"sikkert, via en kryptert tekstmelding (antagelig med automatisk sletting av "
-"meldinger påskrudd), kryptert e-post, eller på tomannshånd. Dette er ikke "
-"nødvendig når OnionSHare brukes for noe som ikke er hemmelig."
+"**Å kommunisere OnionShare-adressen er ikke nødvendigvis sikkert.** Å "
+"dele OnionShare-adressen til folk er OnionShare-brukerens ansvar. Hvis "
+"den sendes usikkert (som gjennom en e-postmelding som holdes oppsyn med "
+"av en angriper), kan en tyvlytter ta rede på at OnionShare blir brukt. "
+"Hvis tyvlytteren laster inn adressen i Tor-nettleseren mens tjenesten "
+"fremdeles er oppe, kan vedkommende få tilgang til den. For å unngå dette,"
+" må adressen kommuniseres sikkert, via en kryptert tekstmelding "
+"(antagelig med automatisk sletting av meldinger påskrudd), kryptert "
+"e-post, eller på tomannshånd. Dette er ikke nødvendig når OnionSHare "
+"brukes for noe som ikke er hemmelig."
 
 #: ../../source/security.rst:24
+#, fuzzy
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
-"**Kommunisering av OnionShare-adressen er ikke nødvendigivs anonym.** Ekstra "
-"forhåndsregler må tas for å forsikre at OnionShare-adressen kommuniseres "
-"anonymt. En ny e-post eller prat konto, som kun blir brukt over Tor, kan "
-"brukes til å dele adressen. Dette er ikke nødvendig med mindre anonymitet er "
-"et mål."
+"**Kommunisering av OnionShare-adressen er ikke nødvendigivs anonym.** "
+"Ekstra forhåndsregler må tas for å forsikre at OnionShare-adressen "
+"kommuniseres anonymt. En ny e-post eller prat konto, som kun blir brukt "
+"over Tor, kan brukes til å dele adressen. Dette er ikke nødvendig med "
+"mindre anonymitet er et mål."
 
 #~ msgid "Security design"
 #~ msgstr ""
@@ -251,3 +255,4 @@ msgstr ""
 #~ "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 d2987b86..e6560a80 100644
--- a/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
+++ b/docs/source/locale/nb_NO/LC_MESSAGES/tor.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-19 08:28+0000\n"
 "Last-Translator: Kurt Eilertsen <kurt@kheds.com>\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-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/tor.rst:2
@@ -28,8 +27,8 @@ 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 ""
-"Velg en måte å koble OnionShare til Tor ved å klikke på \"⚙\"-ikonet nederst "
-"til høyre i OnionShare-vinduet for å komme til de innstillingene."
+"Velg en måte å koble OnionShare til Tor ved å klikke på \"⚙\"-ikonet "
+"nederst til høyre i OnionShare-vinduet for å komme til de innstillingene."
 
 #: ../../source/tor.rst:9
 msgid "Use the ``tor`` bundled with OnionShare"
@@ -40,9 +39,9 @@ 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 ""
-"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."
+"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:14
 msgid ""
@@ -51,10 +50,10 @@ msgid ""
 "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 starter OnionShare, kjørere det en allerede oppsatt ``tor``-prosess i "
-"bakgrunnen som OnionShare kan bruke. Den har ikke innvirkning på andre "
-"``tor``-prosesser på datamaskinen, så du kan bruke Tor-nettleseren på "
-"systemet, eller ``tor`` på egenhånd."
+"Når du starter OnionShare, kjørere det en allerede oppsatt "
+"``tor``-prosess i bakgrunnen som OnionShare kan bruke. Den har ikke "
+"innvirkning på andre ``tor``-prosesser på datamaskinen, så du kan bruke "
+"Tor-nettleseren på systemet, eller ``tor`` på egenhånd."
 
 #: ../../source/tor.rst:18
 msgid "Attempt auto-configuration with Tor Browser"
@@ -67,11 +66,11 @@ msgid ""
 "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 ""
-"Hvis du har `lastet ned Tor-nettleseren <https://www.torproject.org/download/"
-"languages/>`_ og ikke ønsker å ha to ``tor``-prosesser kjørende, kan du "
-"bruke ``tor``-prosessen fra Tor-nettleseren. Ha i minne at du må ha Tor-"
-"nettleseren åpen i bakgrunnen mens du bruker OnionShare for at dette skal "
-"virke."
+"Hvis du har `lastet ned Tor-nettleseren "
+"<https://www.torproject.org/download/languages/>`_ og ikke ønsker å ha to"
+" ``tor``-prosesser kjørende, kan du bruke ``tor``-prosessen fra Tor-"
+"nettleseren. Ha i minne at du må ha Tor-nettleseren åpen i bakgrunnen "
+"mens du bruker OnionShare for at dette skal virke."
 
 #: ../../source/tor.rst:24
 msgid "Using a system ``tor`` in Windows"
@@ -88,14 +87,10 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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 ""
-"Last ned Tor-ekspertprogramknippet for Windows `fra <https://www.torproject."
-"org/download/tor/>`_. Pakk ut den sammenpakkede filen og kopier utpakket "
-"mappe til ``C:\\Program Files (x86)\\`` Gi mappen med ``Data`` og``Tor`` "
-"nytt navn til ``tor-win32``."
 
 #: ../../source/tor.rst:32
 msgid ""
@@ -105,9 +100,9 @@ msgid ""
 "administrator, and use ``tor.exe --hash-password`` to generate a hash of "
 "your password. For example::"
 msgstr ""
-"Finn på et kontrollport-passord. (Å bruke 7 ord etter hverandre, ala ``"
-"comprised stumble rummage work avenging construct volatile`` er en god idé "
-"for et passord.) Nå kan du åpne kommandoledeteksten (``cmd``) som "
+"Finn på et kontrollport-passord. (Å bruke 7 ord etter hverandre, ala "
+"``comprised stumble rummage work avenging construct volatile`` er en god "
+"idé for et passord.) Nå kan du åpne kommandoledeteksten (``cmd``) som "
 "administrator og bruke ``tor.exe --hash-password`` for å generere en "
 "sjekksum for ditt passord. For eksempel::"
 
@@ -117,8 +112,8 @@ msgid ""
 "can ignore). In the case of the above example, it is "
 "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
 msgstr ""
-"Utdata for det sjekksummerte passordet vises etter noen advarsler (som du "
-"kan se bort fra). For eksmplet ovenfor, er den "
+"Utdata for det sjekksummerte passordet vises etter noen advarsler (som du"
+" kan se bort fra). For eksmplet ovenfor, er den "
 "``16:00322E903D96DE986058BB9ABDA91E010D7A863768635AC38E213FDBEF``."
 
 #: ../../source/tor.rst:41
@@ -127,8 +122,8 @@ msgid ""
 "win32\\torrc`` and put your hashed password output in it, replacing the "
 "``HashedControlPassword`` with the one you just generated::"
 msgstr ""
-"Opprett så en ny tekstfil i ``C:\\Program Files (x86)\\tor-win32\\torrc`` og "
-"sett inn den sjekksummerte utdataen for passordet i den, slik at det "
+"Opprett så en ny tekstfil i ``C:\\Program Files (x86)\\tor-win32\\torrc``"
+" og sett inn den sjekksummerte utdataen for passordet i den, slik at det "
 "erstatter ``HashedControlPassword`` med det du akkurat genererte::"
 
 #: ../../source/tor.rst:46
@@ -138,8 +133,8 @@ msgid ""
 "`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
 "this::"
 msgstr ""
-"I administrator-ledeteksten, installer ``tor`` som en tjeneste ved å bruke "
-"den egnede ``torrc``-filen du akkurat oppretet (som beskrevet i "
+"I administrator-ledeteksten, installer ``tor`` som en tjeneste ved å "
+"bruke den egnede ``torrc``-filen du akkurat oppretet (som beskrevet i "
 "`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Slik::"
 
 #: ../../source/tor.rst:50
@@ -147,34 +142,36 @@ msgid "You are now running a system ``tor`` process in Windows!"
 msgstr "Du kjører nå en systembasert``tor``-prosess i Windows!"
 
 #: ../../source/tor.rst:52
+#, fuzzy
 msgid ""
 "Open OnionShare and click the \"⚙\" icon in it. Under \"How should "
 "OnionShare connect to Tor?\" choose \"Connect using control port\", and "
 "set \"Control port\" to ``127.0.0.1`` and \"Port\" to ``9051``. Under "
 "\"Tor authentication settings\" choose \"Password\" and set the password "
-"to the control port password you picked above Click the \"Test Connection"
-" to Tor\" button. If all goes well, you should see \"Connected to the Tor"
-" controller\"."
+"to the control port password you picked above. Click the \"Test "
+"Connection to Tor\" button. If all goes well, you should see \"Connected "
+"to the Tor controller\"."
 msgstr ""
 "Åpne OnionShare og klikk på \"⚙\"-ikonet i programmet. I \"Hvordan skal "
-"OnionShare koble til Tor?\", velg \"Koble til ved bruk av kontrollport\", og "
-"sett \"Kontrollport\" til ``127.0.0.1`` og \"Port\" til ``9051``. Under "
-"\"Innstillinger for Tor-identitetsbekreftelse\" velger du \"Passord\" og "
-"setter passordet til kontrollport-passordet du valgte ovenfor. Klikk på "
-"\"Test tilkoblingen til Tor\"-knappen. Hvis alt går bra, vil du se "
-"\"Tilkoblet til Tor-kontrolleren\"."
+"OnionShare koble til Tor?\", velg \"Koble til ved bruk av kontrollport\","
+" og sett \"Kontrollport\" til ``127.0.0.1`` og \"Port\" til ``9051``. "
+"Under \"Innstillinger for Tor-identitetsbekreftelse\" velger du "
+"\"Passord\" og setter passordet til kontrollport-passordet du valgte "
+"ovenfor. Klikk på \"Test tilkoblingen til Tor\"-knappen. Hvis alt går "
+"bra, vil du se \"Tilkoblet til Tor-kontrolleren\"."
 
 #: ../../source/tor.rst:61
 msgid "Using a system ``tor`` in macOS"
 msgstr "Bruk av systemets Tor i macOS"
 
 #: ../../source/tor.rst:63
+#, fuzzy
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
-"Først må du installere `Homebrew <https://brew.sh/>`_ hvis du ikke allerede "
-"har det, og så installere Tor::"
+"Først må du installere `Homebrew <https://brew.sh/>`_ hvis du ikke "
+"allerede har det, og så installere Tor::"
 
 #: ../../source/tor.rst:67
 msgid "Now configure Tor to allow connections from OnionShare::"
@@ -193,11 +190,12 @@ msgid ""
 "cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 "Åpne OnionShare og klikk på \"⚙\"-ikonet i det. Under \"Hvordan skal "
-"OnionShare koble til Tor?\" velger du \"Koble til ved bruk av socket-fil\", "
-"og setter så socket fil til å være ``/usr/local/var/run/tor/control.socket``"
-". Under \"Innstillinger for Tor-identitetsbekreftelse\" velger du \"Ingen, "
-"identitetsbekreftelse, eller kakebasert identitetsbekreftelse\". Klikk på "
-"\"Test tilkobling til Tor\"-knappen."
+"OnionShare koble til Tor?\" velger du \"Koble til ved bruk av socket-"
+"fil\", og setter så socket fil til å være "
+"``/usr/local/var/run/tor/control.socket``. Under \"Innstillinger for Tor-"
+"identitetsbekreftelse\" velger du \"Ingen, identitetsbekreftelse, eller "
+"kakebasert identitetsbekreftelse\". Klikk på \"Test tilkobling til "
+"Tor\"-knappen."
 
 #: ../../source/tor.rst:84 ../../source/tor.rst:104
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
@@ -214,9 +212,10 @@ msgid ""
 "`official repository <https://support.torproject.org/apt/tor-deb-"
 "repo/>`_."
 msgstr ""
-"Først installerer du ``tor``-pakken. Hvis du bruker Debian, Ubuntu, eller en "
-"lignende Linux-distribusjon, anbefales det å bruke Tor-prosjektets `"
-"offisielle pakkebrønn <https://support.torproject.org/apt/tor-deb-repo/>`_."
+"Først installerer du ``tor``-pakken. Hvis du bruker Debian, Ubuntu, eller"
+" en lignende Linux-distribusjon, anbefales det å bruke Tor-prosjektets "
+"`offisielle pakkebrønn <https://support.torproject.org/apt/tor-deb-"
+"repo/>`_."
 
 #: ../../source/tor.rst:91
 msgid ""
@@ -224,17 +223,17 @@ msgid ""
 "case of Debian and Ubuntu, ``debian-tor``) and configure OnionShare to "
 "connect to your system ``tor``'s control socket file."
 msgstr ""
-"Deretter legger du til din bruker til gruppen som kjører ``tor``-prosessen ("
-"som for Debian og Ubuntu er ``debian-tor`` og setter opp OnionShare til å "
-"koblet til ditt systems ``tor``-kontrollsocket-fil."
+"Deretter legger du til din bruker til gruppen som kjører "
+"``tor``-prosessen (som for Debian og Ubuntu er ``debian-tor`` og setter "
+"opp OnionShare til å koblet til ditt systems ``tor``-kontrollsocket-fil."
 
 #: ../../source/tor.rst:93
 msgid ""
 "Add your user to the ``debian-tor`` group by running this command "
 "(replace ``username`` with your actual username)::"
 msgstr ""
-"Legg så til din bruker i ``debian-tor``-gruppen ved å kjøre denne kommandoen "
-"(erstatt ``username`` med ditt faktiske brukernavn)::"
+"Legg så til din bruker i ``debian-tor``-gruppen ved å kjøre denne "
+"kommandoen (erstatt ``username`` med ditt faktiske brukernavn)::"
 
 #: ../../source/tor.rst:97
 msgid ""
@@ -245,12 +244,12 @@ msgid ""
 "\"No authentication, or cookie authentication\". Click the \"Test "
 "Connection to Tor\" button."
 msgstr ""
-"Utfør en omstart av datamaskinen. Etter at den starter opp igjen, åpner du "
-"OnionShare og klikker på \"⚙\"-ikonet i det. Under «Hvordan skal OnionShare "
-"koble til Tor?» velger du «Koble til ved bruk av socket-fil». Sett socket-"
-"fil til å være ``/var/run/tor/control``. Under «Innstillinger for Tor-"
-"identitetsbekreftelse» velger du «Ingen identitetsbekreftelse, eller  "
-"kakebasert identitetsbekreftelse». Klikk så «Test tilkobling til "
+"Utfør en omstart av datamaskinen. Etter at den starter opp igjen, åpner "
+"du OnionShare og klikker på \"⚙\"-ikonet i det. Under «Hvordan skal "
+"OnionShare koble til Tor?» velger du «Koble til ved bruk av socket-fil». "
+"Sett socket-fil til å være ``/var/run/tor/control``. Under «Innstillinger"
+" for Tor-identitetsbekreftelse» velger du «Ingen identitetsbekreftelse, "
+"eller  kakebasert identitetsbekreftelse». Klikk så «Test tilkobling til "
 "Tor»-knappen."
 
 #: ../../source/tor.rst:107
@@ -265,9 +264,9 @@ msgid ""
 "connects to Tor without one, you don't need to use a bridge."
 msgstr ""
 "Hvis din tilgang til Internett er sensurert, kan du sette opp OnionShare "
-"slik at det kobler til Tor-nettverket ved bruk av `Tor-broer <https://2019."
-"www.torproject.org/docs/bridges.html.en>`_. Hvis OnionShare klarer å koble "
-"til uten, trenger du ikke å bruke en bro."
+"slik at det kobler til Tor-nettverket ved bruk av `Tor-broer "
+"<https://2019.www.torproject.org/docs/bridges.html.en>`_. Hvis OnionShare"
+" klarer å koble til uten, trenger du ikke å bruke en bro."
 
 #: ../../source/tor.rst:111
 msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
@@ -281,9 +280,9 @@ msgid ""
 "need to use a bridge, try the built-in obfs4 ones first."
 msgstr ""
 "Du kan bruke den pluggbare transporten obfs4, den innebygde  meek_lite "
-"(Azure)-pluggbare transporten, eller egendefinerte broer, som du kan finne i "
-"Tor sin `BridgeDB <https://bridges.torproject.org/>`_. Hvis du må bruke en "
-"bro, prøv de innebygde obfs4-baserte broene først."
+"(Azure)-pluggbare transporten, eller egendefinerte broer, som du kan "
+"finne i Tor sin `BridgeDB <https://bridges.torproject.org/>`_. Hvis du må"
+" bruke en bro, prøv de innebygde obfs4-baserte broene først."
 
 #~ msgid "Using a system Tor in Mac OS X"
 #~ msgstr "Bruk av systemets Tor på macOS"
@@ -482,3 +481,21 @@ msgstr ""
 #~ "to use a bridge, you should try"
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
+
+#~ 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 ""
+#~ "Last ned Tor-ekspertprogramknippet for "
+#~ "Windows `fra <https://www.torproject.org/download/tor/>`_."
+#~ " Pakk ut den sammenpakkede filen og"
+#~ " kopier utpakket mappe til ``C:\\Program"
+#~ " Files (x86)\\`` Gi mappen med "
+#~ "``Data`` og``Tor`` nytt navn til "
+#~ "``tor-win32``."
+
diff --git a/docs/source/locale/nl/LC_MESSAGES/install.po b/docs/source/locale/nl/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/nl/LC_MESSAGES/install.po
+++ b/docs/source/locale/nl/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/nl/LC_MESSAGES/security.po b/docs/source/locale/nl/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/nl/LC_MESSAGES/security.po
+++ b/docs/source/locale/nl/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/nl/LC_MESSAGES/tor.po b/docs/source/locale/nl/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/nl/LC_MESSAGES/tor.po
+++ b/docs/source/locale/nl/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/pl/LC_MESSAGES/install.po b/docs/source/locale/pl/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/pl/LC_MESSAGES/install.po
+++ b/docs/source/locale/pl/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/pl/LC_MESSAGES/security.po b/docs/source/locale/pl/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/pl/LC_MESSAGES/security.po
+++ b/docs/source/locale/pl/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/pl/LC_MESSAGES/tor.po b/docs/source/locale/pl/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/pl/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pl/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/help.po b/docs/source/locale/pt_BR/LC_MESSAGES/help.po
index d1eb81e9..ae22fd2c 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/help.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/help.po
@@ -3,37 +3,41 @@
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\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"
+"PO-Revision-Date: 2020-12-17 19:29+0000\n"
+"Last-Translator: Eduardo Addad de Oliveira <duduaddad@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/help.rst:2
 msgid "Getting Help"
-msgstr ""
+msgstr "Obtendo ajuda"
 
 #: ../../source/help.rst:5
 msgid "Read This Website"
-msgstr ""
+msgstr "Leia este site"
 
 #: ../../source/help.rst:7
 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 ""
+"Você encontrará instruções sobre como usar o OnionShare. Leia todas as "
+"seções primeiro para ver se alguma coisa responde às suas perguntas."
 
 #: ../../source/help.rst:10
 msgid "Check the GitHub Issues"
-msgstr ""
+msgstr "Verifique os problemas no GitHub"
 
 #: ../../source/help.rst:12
 msgid ""
@@ -45,7 +49,7 @@ msgstr ""
 
 #: ../../source/help.rst:15
 msgid "Submit an Issue Yourself"
-msgstr ""
+msgstr "Envie você mesmo um problema"
 
 #: ../../source/help.rst:17
 msgid ""
@@ -117,4 +121,3 @@ msgstr ""
 #~ "that we use to discuss the "
 #~ "project."
 #~ msgstr ""
-
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/index.po b/docs/source/locale/pt_BR/LC_MESSAGES/index.po
index 2ad2653c..f111eb0b 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/index.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/index.po
@@ -3,27 +3,31 @@
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
 "POT-Creation-Date: 2020-09-03 11:46-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2020-12-17 19:29+0000\n"
+"Last-Translator: Eduardo Addad de Oliveira <duduaddad@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\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.4-dev\n"
 "Generated-By: Babel 2.8.0\n"
 
 #: ../../source/index.rst:2
 msgid "OnionShare's documentation"
-msgstr ""
+msgstr "Documentação do OnionShare"
 
 #: ../../source/index.rst:6
 msgid ""
 "OnionShare is an open source tool that lets you securely and anonymously "
 "share files, host websites, and chat with friends using the Tor network."
 msgstr ""
-
+"OnionShare é uma ferramenta de código aberto que permite compartilhar "
+"arquivos de forma segura e anônima, hospedar sites e conversar com amigos "
+"usando a rede Tor."
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/install.po b/docs/source/locale/pt_BR/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/install.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/pt_BR/LC_MESSAGES/security.po b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/security.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/pt_BR/LC_MESSAGES/sphinx.po b/docs/source/locale/pt_BR/LC_MESSAGES/sphinx.po
index f2cc8ed5..a18e6b66 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/sphinx.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/sphinx.po
@@ -3,25 +3,26 @@
 # This file is distributed under the same license as the OnionShare package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
 "POT-Creation-Date: 2020-09-03 11:37-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2020-12-17 19:29+0000\n"
+"Last-Translator: Eduardo Addad de Oliveira <duduaddad@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pt_BR\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.4-dev\n"
 "Generated-By: Babel 2.8.0\n"
 
 #: ../../source/_templates/versions.html:10
 msgid "Versions"
-msgstr ""
+msgstr "Versões"
 
 #: ../../source/_templates/versions.html:18
 msgid "Languages"
-msgstr ""
-
+msgstr "Idiomas"
diff --git a/docs/source/locale/pt_BR/LC_MESSAGES/tor.po b/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pt_BR/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/pt_PT/LC_MESSAGES/install.po b/docs/source/locale/pt_PT/LC_MESSAGES/install.po
index 93256281..bf16ac3f 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/install.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/install.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-17 10:28+0000\n"
 "Last-Translator: Fábio Henriques <fabyohenriques@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pt_PT\n"
+"Language-Team: pt_PT <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.4-dev\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: ../../source/install.rst:2
@@ -32,54 +31,61 @@ msgid ""
 "You can download OnionShare for Windows and macOS from the `OnionShare "
 "website <https://onionshare.org/>`_."
 msgstr ""
-"Pode descarregar o OnionShare para Windows ou macOS a partir do `OnionShare "
-"website <https://onionshare.org/>`_."
+"Pode descarregar o OnionShare para Windows ou macOS a partir do "
+"`OnionShare website <https://onionshare.org/>`_."
 
 #: ../../source/install.rst:12
 msgid "Install in Linux"
 msgstr "Instalar em Linux"
 
 #: ../../source/install.rst:14
+#, fuzzy
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
-"Existem várias maneiras de instalar o OnionShare para Linux, mas a maneira "
-"recomendada é usar o pacote `Flatpak <https://flatpak.org/>`_ ou `Snapcraft "
-"<https://snapcraft.io/>`_ . Ambos asseguram que a versão usada é a mais "
-"recente e correm o OnionShare dentro de uma sandbox."
+"Existem várias maneiras de instalar o OnionShare para Linux, mas a "
+"maneira recomendada é usar o pacote `Flatpak <https://flatpak.org/>`_ ou "
+"`Snapcraft <https://snapcraft.io/>`_ . Ambos asseguram que a versão usada"
+" é a mais recente e correm o OnionShare dentro de uma sandbox."
 
 #: ../../source/install.rst:17
+#, fuzzy
 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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
-"O Snapcraft vem embutido no Ubuntu e o Flatpak vem embutido na Fedora, cabe "
-"a si escolher qual usar. Ambos funcionam em todas as distribuições Linux."
+"O Snapcraft vem embutido no Ubuntu e o Flatpak vem embutido na Fedora, "
+"cabe a si escolher qual usar. Ambos funcionam em todas as distribuições "
+"Linux."
 
 #: ../../source/install.rst:19
 msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**Instalar OnionShare utilizando Flatpak**: https://flathub.org/apps/details/"
-"org.onionshare.OnionShare"
+"**Instalar OnionShare utilizando Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#, fuzzy
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
-"**Instalar OnionShare utilizando Snapcraft**: https://snapcraft.io/onionshare"
+"**Instalar OnionShare utilizando Snapcraft**: "
+"https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
+#, fuzzy
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
-"Também pode descarregar e instalar os pacotes com assinatura PGP ``.flatpak``"
-" ou ``.snap`` a partir de https://onionshare.org/dist/ se preferir."
+"Também pode descarregar e instalar os pacotes com assinatura PGP "
+"``.flatpak`` ou ``.snap`` a partir de https://onionshare.org/dist/ se "
+"preferir."
 
 #: ../../source/install.rst:28
 msgid "Verifying PGP signatures"
@@ -94,10 +100,10 @@ msgid ""
 "rely on those alone if you'd like."
 msgstr ""
 "Pode verificar se o pacote que foi instalado é legítimo e se não foi "
-"falsificado com a verificação da sua assinatura PGP. Para Windows ou macOS, "
-"este passo é opcional e fornece defesa abrangente: Os binários do OnionShare "
-"incluem assinaturas especificas do sistema operativo que chegam, se desejar, "
-"para confiar nelas."
+"falsificado com a verificação da sua assinatura PGP. Para Windows ou "
+"macOS, este passo é opcional e fornece defesa abrangente: Os binários do "
+"OnionShare incluem assinaturas especificas do sistema operativo que "
+"chegam, se desejar, para confiar nelas."
 
 #: ../../source/install.rst:34
 msgid "Signing key"
@@ -111,11 +117,12 @@ msgid ""
 "<https://keys.openpgp.org/vks/v1/by-"
 "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 msgstr ""
-"Os pacotes são assinados pelo Micah Lee, programador principal, usando a sua "
-"chave pública PGP com fingerprint "
-"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Pode descarregar a chave do "
-"Micah `a partir de keys.openpgp.org keyserver <https://keys.openpgp.org/vks/"
-"v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Os pacotes são assinados pelo Micah Lee, programador principal, usando a "
+"sua chave pública PGP com fingerprint "
+"``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Pode descarregar a chave do"
+" Micah `a partir de keys.openpgp.org keyserver "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 
 #: ../../source/install.rst:38
 msgid ""
@@ -124,39 +131,41 @@ msgid ""
 "probably want `Gpg4win <https://www.gpg4win.org/>`_."
 msgstr ""
 "Deve ter instalado o GnuPG para verificar assinaturas. Para o macOS "
-"provavelmente prefere `GPGTools <https://gpgtools.org/>`_, e para Windows `"
-"Gpg4win <https://www.gpg4win.org/>`_."
+"provavelmente prefere `GPGTools <https://gpgtools.org/>`_, e para Windows"
+" `Gpg4win <https://www.gpg4win.org/>`_."
 
 #: ../../source/install.rst:41
 msgid "Signatures"
 msgstr "Assinaturas"
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
-"Pode encontrar as assinaturas nos ficheiros (``.asc``), assim como Windows, "
-"macOS, Flatpak, Snapcraft, e pacotes fonte em https://onionshare.org/dist/ "
-"nas pastas com o nome de cada versão do OnionShare. Também as pode encontrar "
-"nas ` Páginas de lançamento do GitHub <https://github.com/micahflee/"
-"onionshare/releases>`_."
+"Pode encontrar as assinaturas nos ficheiros (``.asc``), assim como "
+"Windows, macOS, Flatpak, Snapcraft, e pacotes fonte em "
+"https://onionshare.org/dist/ nas pastas com o nome de cada versão do "
+"OnionShare. Também as pode encontrar nas ` Páginas de lançamento do "
+"GitHub <https://github.com/micahflee/onionshare/releases>`_."
 
 #: ../../source/install.rst:47
 msgid "Verifying"
 msgstr "Verificação"
 
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
-"Assim que tenha importado a chave pública do Micah para o seu chaveiro no "
-"GnuPG, descarregado o binário e a assinatura ``.asc``, pode verificar o "
+"Assim que tenha importado a chave pública do Micah para o seu chaveiro no"
+" GnuPG, descarregado o binário e a assinatura ``.asc``, pode verificar o "
 "binário para macOS no terminal desta forma::"
 
 #: ../../source/install.rst:53
@@ -168,30 +177,32 @@ msgid "The expected output looks like this::"
 msgstr "O resultado esperado é o seguinte:"
 
 #: ../../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.)"
+"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 ""
-"Se não vê a mensagem 'Good signature from', pode existir um problema com a "
-"integridade do ficheiro (malicioso ou de outra forma), e o pacote não deve "
-"ser instalado. (O AVISO apresentado acima, não é um problema com o pacote: "
-"Apenas significa que ainda não defeniu nenhum nível de 'confiança' com a "
-"chave PGP do Micah.)"
+"Se não vê a mensagem 'Good signature from', pode existir um problema com "
+"a integridade do ficheiro (malicioso ou de outra forma), e o pacote não "
+"deve ser instalado. (O AVISO apresentado acima, não é um problema com o "
+"pacote: Apenas significa que ainda não defeniu nenhum nível de "
+"'confiança' com a chave PGP do Micah.)"
 
 #: ../../source/install.rst:71
+#, fuzzy
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
-"Se quiser aprender mais sobre verificação de assinaturas PGP, os guias `"
-"Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ e `Tor "
-"Project <https://support.torproject.org/tbb/how-to-verify-signature/>`_ "
-"podem ajudar."
+"Se quiser aprender mais sobre verificação de assinaturas PGP, os guias "
+"`Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ e "
+"`Tor Project <https://support.torproject.org/tbb/how-to-verify-"
+"signature/>`_ podem ajudar."
 
 #~ msgid "Install on Windows or macOS"
 #~ msgstr ""
@@ -307,3 +318,4 @@ msgstr ""
 #~ "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 79923cda..05816266 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/security.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/pt_PT/LC_MESSAGES/tor.po b/docs/source/locale/pt_PT/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/pt_PT/LC_MESSAGES/tor.po
+++ b/docs/source/locale/pt_PT/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/ro/LC_MESSAGES/install.po b/docs/source/locale/ro/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/ro/LC_MESSAGES/install.po
+++ b/docs/source/locale/ro/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/ro/LC_MESSAGES/security.po b/docs/source/locale/ro/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/ro/LC_MESSAGES/security.po
+++ b/docs/source/locale/ro/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/ro/LC_MESSAGES/tor.po b/docs/source/locale/ro/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/ro/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ro/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/ru/LC_MESSAGES/install.po b/docs/source/locale/ru/LC_MESSAGES/install.po
index c47fba10..b18370cc 100644
--- a/docs/source/locale/ru/LC_MESSAGES/install.po
+++ b/docs/source/locale/ru/LC_MESSAGES/install.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-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-02 09:26+0000\n"
 "Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
 "Language: ru\n"
@@ -41,15 +41,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -59,12 +59,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -121,8 +121,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -137,17 +137,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -265,3 +265,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/ru/LC_MESSAGES/security.po b/docs/source/locale/ru/LC_MESSAGES/security.po
index 9ec7a820..1fcd5aa8 100644
--- a/docs/source/locale/ru/LC_MESSAGES/security.po
+++ b/docs/source/locale/ru/LC_MESSAGES/security.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-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-04 13:26+0000\n"
 "Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
 "Language: ru\n"
@@ -78,8 +78,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -105,10 +105,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid ""
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/ru/LC_MESSAGES/tor.po b/docs/source/locale/ru/LC_MESSAGES/tor.po
index 5b3693aa..88d27b7e 100644
--- a/docs/source/locale/ru/LC_MESSAGES/tor.po
+++ b/docs/source/locale/ru/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-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-11-02 09:26+0000\n"
 "Last-Translator: Yuri Slobodyanyuk <yuri@yurisk.info>\n"
 "Language: ru\n"
@@ -72,9 +72,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -118,9 +118,9 @@ msgid ""
 "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\"."
+"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:61
@@ -130,7 +130,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -414,3 +414,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/sr@latin/LC_MESSAGES/install.po b/docs/source/locale/sr@latin/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/install.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/sr@latin/LC_MESSAGES/security.po b/docs/source/locale/sr@latin/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/security.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/sr@latin/LC_MESSAGES/tor.po b/docs/source/locale/sr@latin/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/sr@latin/LC_MESSAGES/tor.po
+++ b/docs/source/locale/sr@latin/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/sv/LC_MESSAGES/install.po b/docs/source/locale/sv/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/sv/LC_MESSAGES/install.po
+++ b/docs/source/locale/sv/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/sv/LC_MESSAGES/security.po b/docs/source/locale/sv/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/sv/LC_MESSAGES/security.po
+++ b/docs/source/locale/sv/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/sv/LC_MESSAGES/tor.po b/docs/source/locale/sv/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/sv/LC_MESSAGES/tor.po
+++ b/docs/source/locale/sv/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/te/LC_MESSAGES/install.po b/docs/source/locale/te/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/te/LC_MESSAGES/install.po
+++ b/docs/source/locale/te/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/te/LC_MESSAGES/security.po b/docs/source/locale/te/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/te/LC_MESSAGES/security.po
+++ b/docs/source/locale/te/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/te/LC_MESSAGES/tor.po b/docs/source/locale/te/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/te/LC_MESSAGES/tor.po
+++ b/docs/source/locale/te/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/install.po b/docs/source/locale/tr/LC_MESSAGES/install.po
index b157b397..e9d0341f 100644
--- a/docs/source/locale/tr/LC_MESSAGES/install.po
+++ b/docs/source/locale/tr/LC_MESSAGES/install.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-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-10-08 21:26+0000\n"
 "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
 "Language: tr\n"
@@ -44,15 +44,15 @@ msgstr "Linux'te Flatpak ile kurulum"
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -66,12 +66,16 @@ msgstr ""
 "Flathub'dan OnionShare'i kurun."
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#, fuzzy
+msgid "**Install OnionShare using Snap**: 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:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -119,10 +123,10 @@ msgstr "İmzalar"
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 "
@@ -139,8 +143,8 @@ msgstr "Doğrulama"
 #, 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::"
+"downloaded the binary and and ``.asc`` signature, you can 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ı "
@@ -161,9 +165,9 @@ msgstr "Aşağıdakine benzer bir çıktı alınması beklenir::"
 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.)"
+"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 "
@@ -174,10 +178,10 @@ msgstr ""
 #: ../../source/install.rst:71
 #, fuzzy
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 "PGP imzalarının doğrulanması hakkında daha fazla bilgi edinmek "
 "istiyorsanız, `Qubes OS <https://www.qubes-os.org/security/verifying-"
@@ -257,3 +261,32 @@ msgstr ""
 #~ "/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_ "
 #~ "indirebilirsiniz."
 
+#~ 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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
diff --git a/docs/source/locale/tr/LC_MESSAGES/security.po b/docs/source/locale/tr/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/tr/LC_MESSAGES/security.po
+++ b/docs/source/locale/tr/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/tr/LC_MESSAGES/tor.po b/docs/source/locale/tr/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/tr/LC_MESSAGES/tor.po
+++ b/docs/source/locale/tr/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/uk/LC_MESSAGES/install.po b/docs/source/locale/uk/LC_MESSAGES/install.po
index 8fb8a50a..b57fab90 100644
--- a/docs/source/locale/uk/LC_MESSAGES/install.po
+++ b/docs/source/locale/uk/LC_MESSAGES/install.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-11-17 10:28+0000\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
 "Language-Team: none\n"
 "Language: uk\n"
@@ -44,46 +44,44 @@ msgstr "Встановлення на Linux"
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 "Існують різні способи встановлення OnionShare на Linux, але радимо "
 "використовувати пакунок `Flatpak <https://flatpak.org/>`_ або пакунок "
-"Snapcraft `Snapcraft <https://snapcraft.io/>`_. Flatpak і Snapcraft "
-"гарантують, що ви завжди будете користуватися найновішою версією та "
-"запускати OnionShare в пісочниці."
+"Snapcraft `Snap <https://snapcraft.io/>`_. Flatpak і Snapcraft гарантують, "
+"що ви завжди користуватиметеся найновішою версією та запускатимете "
+"OnionShare в пісочниці."
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
-"Snapcraft вбудовано в Ubuntu, а Flatpak — у Fedora, але те, чим ви "
-"користуєтеся залежить від вас. Обидва вони працюють у всіх дистрибутивах "
-"Linux."
+"Snap вбудовано в Ubuntu, а Flatpak — у Fedora, але те, чим ви користуєтеся "
+"залежить від вас. Обидва вони працюють у всіх дистрибутивах Linux."
 
 #: ../../source/install.rst:19
 msgid ""
 "**Install OnionShare using Flatpak**: "
 "https://flathub.org/apps/details/org.onionshare.OnionShare"
 msgstr ""
-"**Встановіть OnionShare за допомогою Flatpak**: https://flathub.org/apps/"
-"details/org.onionshare.OnionShare"
+"**Встановіть OnionShare за допомогою Flatpak**: "
+"https://flathub.org/apps/details/org.onionshare.OnionShare"
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
-"**Встановіть OnionShare за допомогою Snapcraft**: https://snapcraft.io/"
-"onionshare"
+"**Встановіть OnionShare за допомогою Snap**: https://snapcraft.io/onionshare"
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
-"Ви також можете завантажити та встановити пакети з PGP-підписом ``.flatpak`` "
-"або ``.snap`` з https://onionshare.org/dist/, якщо хочете."
+"Ви також можете завантажити та встановити пакунки з PGP-підписом ``.flatpak``"
+" або ``.snap`` з https://onionshare.org/dist/, якщо хочете."
 
 #: ../../source/install.rst:28
 msgid "Verifying PGP signatures"
@@ -97,11 +95,11 @@ msgid ""
 "binaries include operating system-specific signatures, and you can just "
 "rely on those alone if you'd like."
 msgstr ""
-"Ви можете переконатися, що пакет, який ви завантажуєте, є справжнім і не був "
-"підроблений, перевіривши його підпис PGP. Для Windows і macOS цей крок не є "
-"обов'язковим і забезпечує захист в глибині: двійкові файли OnionShare "
-"включають підписи, специфічні для операційної системи, і ви можете просто "
-"покладатися лише на них, якщо хочете."
+"Ви можете переконатися, що пакет, який ви завантажуєте, є справжнім і не "
+"був підроблений, перевіривши його підпис PGP. Для Windows і macOS цей "
+"крок не є обов'язковим і забезпечує захист в глибині: двійкові файли "
+"OnionShare включають підписи, специфічні для операційної системи, і ви "
+"можете просто покладатися лише на них, якщо хочете."
 
 #: ../../source/install.rst:34
 msgid "Signing key"
@@ -115,10 +113,11 @@ msgid ""
 "<https://keys.openpgp.org/vks/v1/by-"
 "fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 msgstr ""
-"Пакунки підписує Micah Lee, основний розробник, своїм відкритим ключем PGP з "
-"цифровим відбитком ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. Ключ Micah "
-"можна завантажити `з сервера ключів keys.openpgp.org <https://keys.openpgp."
-"org/vks/v1/by-fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
+"Пакунки підписує Micah Lee, основний розробник, своїм відкритим ключем "
+"PGP з цифровим відбитком ``927F419D7EC82C2F149C1BD1403C2657CD994F73``. "
+"Ключ Micah можна завантажити `з сервера ключів keys.openpgp.org "
+"<https://keys.openpgp.org/vks/v1/by-"
+"fingerprint/927F419D7EC82C2F149C1BD1403C2657CD994F73>`_."
 
 #: ../../source/install.rst:38
 msgid ""
@@ -126,9 +125,9 @@ msgid ""
 "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:41
 msgid "Signatures"
@@ -136,16 +135,16 @@ msgstr "Підписи"
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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, "
-"Flatpak, Snapcraft та джерельні пакунки за адресою https://onionshare.org/"
-"dist/ у теках, названих для кожної версії OnionShare. Ви також можете знайти "
-"їх на `сторінці випусків GitHub <https://github.com/micahflee/onionshare/"
+"Flatpak, Snap та джерельні пакунки за адресою https://onionshare.org/dist/ у "
+"теках, названих для кожної версії OnionShare. Ви також можете знайти їх на `"
+"сторінці випусків GitHub <https://github.com/micahflee/onionshare/"
 "releases>`_."
 
 #: ../../source/install.rst:47
@@ -155,11 +154,11 @@ msgstr "Перевірка"
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
-"Після того, як відкритий ключ Micah додано до вашої збірки ключів GnuPG, "
-"завантажено двійковий файл і завантажено підпис ``.asc``, ви можете "
+"Після того, як відкритий ключ Micah імпортовано до вашої збірки ключів "
+"GnuPG, завантажено двійковий файл і завантажено підпис ``.asc``, ви можете "
 "перевірити двійковий файл для macOS в терміналі в такий спосіб::"
 
 #: ../../source/install.rst:53
@@ -174,21 +173,21 @@ msgstr "Очікуваний результат може виглядати та
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 "Якщо ви хочете дізнатися докладніше про перевірку підписів PGP, настанови "
 "для `Qubes OS <https://www.qubes-os.org/security/verifying-signatures/>`_ та "
diff --git a/docs/source/locale/uk/LC_MESSAGES/security.po b/docs/source/locale/uk/LC_MESSAGES/security.po
index 2853f7b2..0df854e6 100644
--- a/docs/source/locale/uk/LC_MESSAGES/security.po
+++ b/docs/source/locale/uk/LC_MESSAGES/security.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-11-17 10:28+0000\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
 "Language-Team: none\n"
 "Language: uk\n"
@@ -53,8 +53,8 @@ msgstr ""
 "Користування OnionShare означає розміщення служб безпосередньо на вашому "
 "комп'ютері. Під час спільного доступу до файлів за допомогою OnionShare, "
 "вони не завантажуються на будь-який сервер. Якщо ви створюєте чат "
-"OnionShare, ваш комп'ютер також є сервером для цього. Це дозволяє уникнути "
-"традиційної моделі, коли необхідно довіряти комп'ютерам інших."
+"OnionShare, ваш комп'ютер також є сервером для цього. Це дозволяє "
+"уникнути традиційної моделі, коли необхідно довіряти комп'ютерам інших."
 
 #: ../../source/security.rst:13
 msgid ""
@@ -68,10 +68,10 @@ msgid ""
 msgstr ""
 "** Мережні підслуховувачі не можуть шпигувати за всім, що відбувається в "
 "OnionShare в транзиті.** Зв'язок між службою onion Tor і Tor Browser "
-"зашифровано наскрізно. Це означає, що мережні зловмисники не можуть побачити "
-"нічого, крім захищеного трафіку Tor. Навіть якщо підслуховувач є зловмисним "
-"вузлом, який використовується для під'єднання браузера Tor до служби onion "
-"OnionShare, трафік захищено приватним ключем служби onion."
+"зашифровано наскрізно. Це означає, що мережні зловмисники не можуть "
+"побачити нічого, крім захищеного трафіку Tor. Навіть якщо підслуховувач є"
+" зловмисним вузлом, який використовується для під'єднання браузера Tor до"
+" служби onion OnionShare, трафік захищено приватним ключем служби onion."
 
 #: ../../source/security.rst:15
 msgid ""
@@ -94,20 +94,20 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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. Якщо атака "
+"доступ ні до чого.** Попередні напади на мережу Tor для виявлення служб "
+"onion дозволили зловмиснику виявити приватні адреси .onion. Якщо напад "
 "виявить приватну адресу OnionShare, пароль не дозволить їм отримати до неї "
-"доступ (якщо користувач OnionShare не вирішить вимкнути його та зробити "
+"доступ (якщо користувач OnionShare не вирішив вимкнути його та зробити "
 "службу загальнодоступною). Пароль створюється шляхом вибору двох випадкових "
-"слів зпереліку з 6800 слів, що робить 6800^2 або близько 46 мільйонів "
-"можливих паролів. Можна спробувати лише 20 невдалих спроб, перш ніж "
+"слів зпереліку з 6800 слів, що робить 6800² або близько 46 мільйонів "
+"можливих паролів. Можна здійснити лише 20 невдалих спроб, перш ніж "
 "OnionShare зупинить сервер, запобігаючи грубому намаганню зламу пароля."
 
 #: ../../source/security.rst:20
@@ -127,23 +127,24 @@ msgid ""
 "isn't necessary when using OnionShare for something that isn't secret."
 msgstr ""
 "**Зв’язок з адресою OnionShare може бути ненадійним.** Передача адреси "
-"OnionShare людям є відповідальністю користувача OnionShare. Якщо надіслано "
-"ненадійно (наприклад, через повідомлення електронною поштою, яку контролює "
-"зловмисник), підслуховувач може дізнатися, що використовується OnionShare. "
-"Якщо підслуховувачі завантажать адресу в Tor Browser, поки служба ще працює, "
-"вони можуть отримати до неї доступ. Щоб уникнути цього, адресу потрібно "
-"передавати надійно, за допомогою захищеного текстового повідомлення ("
-"можливо, з увімкненими повідомленнями, що зникають), захищеного електронного "
-"листа або особисто. Це не потрібно при використанні OnionShare для чогось, "
-"що не є таємницею."
+"OnionShare людям є відповідальністю користувача OnionShare. Якщо "
+"надіслано ненадійно (наприклад, через повідомлення електронною поштою, "
+"яку контролює зловмисник), підслуховувач може дізнатися, що "
+"використовується OnionShare. Якщо підслуховувачі завантажать адресу в Tor"
+" Browser, поки служба ще працює, вони можуть отримати до неї доступ. Щоб "
+"уникнути цього, адресу потрібно передавати надійно, за допомогою "
+"захищеного текстового повідомлення (можливо, з увімкненими "
+"повідомленнями, що зникають), захищеного електронного листа або особисто."
+" Це не потрібно при використанні OnionShare для чогось, що не є "
+"таємницею."
 
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 "**Повідомлення адреси OnionShare може бути не анонімним.** Потрібно вжити "
 "додаткових заходів, щоб забезпечити анонімну передачу адреси OnionShare. Для "
diff --git a/docs/source/locale/uk/LC_MESSAGES/tor.po b/docs/source/locale/uk/LC_MESSAGES/tor.po
index 691adb6c..9317e157 100644
--- a/docs/source/locale/uk/LC_MESSAGES/tor.po
+++ b/docs/source/locale/uk/LC_MESSAGES/tor.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
-"PO-Revision-Date: 2020-11-17 10:28+0000\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
+"PO-Revision-Date: 2020-12-16 00:29+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
 "Language-Team: none\n"
 "Language: uk\n"
@@ -29,8 +29,8 @@ 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 ""
-"Виберіть спосіб під'єднання OnionShare до Tor, натиснувши піктограму «⚙» у "
-"нижньому правому куті вікна OnionShare, щоб перейти до його параметрів."
+"Виберіть спосіб під'єднання OnionShare до Tor, натиснувши піктограму «⚙» "
+"у нижньому правому куті вікна OnionShare, щоб перейти до його параметрів."
 
 #: ../../source/tor.rst:9
 msgid "Use the ``tor`` bundled with OnionShare"
@@ -51,10 +51,10 @@ msgid ""
 "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`` ."
+"Коли ви відкриваєте OnionShare, він запускає вже налаштований процес "
+"``tor`` у фоновому режимі для використання OnionShare. Це не заважає "
+"іншим процесам ``tor`` на вашому комп'ютері, тому ви можете окремо "
+"використовувати браузер Tor або систему ``tor`` ."
 
 #: ../../source/tor.rst:18
 msgid "Attempt auto-configuration with Tor Browser"
@@ -67,10 +67,11 @@ msgid ""
 "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 ""
-"Якщо ви `завантажили браузер Tor <https://www.torproject.org>`_ і не хочете, "
-"щоб працювали два процеси ``tor``, ви можете використовувати процес ``tor`` "
-"із браузера Tor. Майте на увазі, що для того, щоб це працювало, потрібно "
-"тримати браузер Tor у фоновому режимі під час використання OnionShare."
+"Якщо ви `завантажили браузер Tor <https://www.torproject.org>`_ і не "
+"хочете, щоб працювали два процеси ``tor``, ви можете використовувати "
+"процес ``tor`` із браузера Tor. Майте на увазі, що для того, щоб це "
+"працювало, потрібно тримати браузер Tor у фоновому режимі під час "
+"використання OnionShare."
 
 #: ../../source/tor.rst:24
 msgid "Using a system ``tor`` in Windows"
@@ -87,13 +88,13 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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)\\`` і перейменуйте теку з ``Data`` та ``Tor`` в "
+"download/tor/>`_. Видобудьте стиснений файл і копіюйте видобуту теку до ``C:"
+"\\Program Files (x86)\\`` й перейменуйте теку з ``Data`` та ``Tor`` в "
 "середині на ``tor-win32``."
 
 #: ../../source/tor.rst:32
@@ -104,11 +105,11 @@ msgid ""
 "administrator, and use ``tor.exe --hash-password`` to generate a hash of "
 "your password. For example::"
 msgstr ""
-"Створіть пароль контрольного порту. (використання послідовності з 7 слів ``"
-"comprised stumble rummage work avenging construct volatile`` буде чудовою "
-"ідеєю.) Тепер відкрийте командний рядок (``cmd``) як адміністратор і "
-"використовуйте ``tor.exe --hash-password``, щоб створити хеш вашого пароля. "
-"Наприклад::"
+"Створіть пароль контрольного порту. (використання послідовності з 7 слів "
+"``comprised stumble rummage work avenging construct volatile`` буде "
+"чудовою ідеєю.) Тепер відкрийте командний рядок (``cmd``) як "
+"адміністратор і використовуйте ``tor.exe --hash-password``, щоб створити "
+"хеш вашого пароля. Наприклад::"
 
 #: ../../source/tor.rst:39
 msgid ""
@@ -137,8 +138,9 @@ msgid ""
 "`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Like "
 "this::"
 msgstr ""
-"В командному рядку адміністратора встановіть ``tor`` службою, використовуючи "
-"відповідний файл ``torrc``, який ви щойно створили (як описано у "
+"В командному рядку адміністратора встановіть ``tor`` службою, "
+"використовуючи відповідний файл ``torrc``, який ви щойно створили (як "
+"описано у "
 "`<https://2019.www.torproject.org/docs/faq.html.en#NTService>`_). Як це::"
 
 #: ../../source/tor.rst:50
@@ -151,13 +153,13 @@ msgid ""
 "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\"."
+"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`` та «Порт» на "
+"керування» та встановіть «Порт керування» на ``127.0.0.1`` та «Порт» на "
 "``9051``. У розділі «Параметри автентифікації Tor» виберіть «Пароль» і "
 "встановіть пароль для пароля контрольного порту, який ви вибрали раніше. "
 "Натисніть кнопку «Перевірити з'єднання з Tor». Якщо все добре, ви побачите «"
@@ -170,10 +172,10 @@ msgstr "Користування системним ``tor`` на macOS"
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
-"Спочатку встановіть `Homebrew, <http://brew.sh/>`_ якщо у вас його ще немає. "
-"Потім встановіть Tor::"
+"Спочатку встановіть `Homebrew <https://brew.sh/>`_, якщо у вас його ще "
+"немає. Потім встановіть Tor::"
 
 #: ../../source/tor.rst:67
 msgid "Now configure Tor to allow connections from OnionShare::"
@@ -192,10 +194,11 @@ msgid ""
 "cookie authentication\". Click the \"Test Connection to Tor\" button."
 msgstr ""
 "Відкрийте OnionShare. Клацніть піктограму «⚙». У розділі «Як OnionShare "
-"повинен з'єднуватися з Tor?» виберіть «Під'єднуватися через файл сокета» та "
-"встановіть для файлу сокета шлях ``/usr/local/var/run/tor/control.socket``. "
-"У розділі «Параметри автентифікації Tor» виберіть «Без автентифікації або "
-"автентифікація через cookie». Натисніть кнопку «Перевірити з'єднання з Tor»."
+"повинен з'єднуватися з Tor?» виберіть «Під'єднуватися через файл сокета» "
+"та встановіть для файлу сокета шлях "
+"``/usr/local/var/run/tor/control.socket``. У розділі «Параметри "
+"автентифікації Tor» виберіть «Без автентифікації або автентифікація через"
+" cookie». Натисніть кнопку «Перевірити з'єднання з Tor»."
 
 #: ../../source/tor.rst:84 ../../source/tor.rst:104
 msgid "If all goes well, you should see \"Connected to the Tor controller\"."
@@ -212,9 +215,9 @@ msgid ""
 "`official repository <https://support.torproject.org/apt/tor-deb-"
 "repo/>`_."
 msgstr ""
-"Спочатку встановіть пакунок ``tor``. Якщо ви використовуєте Debian, Ubuntu "
-"або подібний дистрибутив Linux, я раджу вам використовувати `офіційне "
-"сховище <https://support.torproject.org/apt/tor-deb-repo/>`_."
+"Спочатку встановіть пакунок ``tor``. Якщо ви використовуєте Debian, "
+"Ubuntu або подібний дистрибутив Linux, я раджу вам використовувати "
+"`офіційне сховище <https://support.torproject.org/apt/tor-deb-repo/>`_."
 
 #: ../../source/tor.rst:91
 msgid ""
@@ -222,9 +225,9 @@ msgid ""
 "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`` вашої системи."
+"Далі додайте користувача до групи, яка запускає процес ``tor`` (у випадку"
+" з Debian і Ubuntu, ``debian-tor``) і налаштуйте OnionShare для "
+"під'єднання до файлу керування сокетом ``tor`` вашої системи."
 
 #: ../../source/tor.rst:93
 msgid ""
@@ -245,10 +248,10 @@ msgid ""
 msgstr ""
 "Перезапустіть комп'ютер. Після запуску, відкрийте OnionShare. Клацніть "
 "піктограму «⚙». У розділі «Як OnionShare повинен з'єднуватися з Tor?» "
-"виберіть «Під'єднуватися через файл сокета» та встановіть для файлу сокета "
-"шлях ``/var/run/tor/control``. У розділі «Параметри автентифікації Tor» "
-"виберіть «Без автентифікації або автентифікація через cookie». Натисніть "
-"кнопку «Перевірити з'єднання з Tor»."
+"виберіть «Під'єднуватися через файл сокета» та встановіть для файлу "
+"сокета шлях ``/var/run/tor/control``. У розділі «Параметри автентифікації"
+" Tor» виберіть «Без автентифікації або автентифікація через cookie». "
+"Натисніть кнопку «Перевірити з'єднання з Tor»."
 
 #: ../../source/tor.rst:107
 msgid "Using Tor bridges"
@@ -261,10 +264,10 @@ msgid ""
 "<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 ""
-"Якщо ваш доступ до Інтернету цензуровано, ви можете налаштувати OnionShare "
-"для з'єднання з мережею Tor за допомогою `Мостів Tor <https://2019.www."
-"torproject.org/docs/bridges.html.en>`_. Якщо OnionShare під'єднано до Tor "
-"без них, вам не потрібно користуватися мостом."
+"Якщо ваш доступ до Інтернету цензуровано, ви можете налаштувати "
+"OnionShare для з'єднання з мережею Tor за допомогою `Мостів Tor "
+"<https://2019.www.torproject.org/docs/bridges.html.en>`_. Якщо OnionShare"
+" під'єднано до Tor без них, вам не потрібно користуватися мостом."
 
 #: ../../source/tor.rst:111
 msgid "To configure bridges, click the \"⚙\" icon in OnionShare."
@@ -277,10 +280,11 @@ msgid ""
 "obtain from Tor's `BridgeDB <https://bridges.torproject.org/>`_. If you "
 "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 ""
@@ -420,3 +424,19 @@ msgstr ""
 #~ "cookie\". Натисніть кнопку \"Тест "
 #~ "налаштувань\". Якщо все піде добре, ви"
 #~ " побачите успішне підключення до Tor."
+
+#~ 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 ""
+#~ "Завантажте набір експерта Tor для "
+#~ "Windows `із <https://www.torproject.org/download/tor/>`_."
+#~ " Розархівуйте zip-файл і копіюйте видобуту"
+#~ " теку до ``C:\\Program Files (x86)\\`` "
+#~ "і перейменуйте теку з ``Data`` та "
+#~ "``Tor`` в середині на ``tor-win32``."
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/install.po b/docs/source/locale/zh_CN/LC_MESSAGES/install.po
index 640c688c..8a1e3472 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/install.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/install.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -39,15 +39,15 @@ msgstr ""
 msgid ""
 "There are various ways to install OnionShare for Linux, but the "
 "recommended way is to use either the `Flatpak <https://flatpak.org/>`_ or"
-" the `Snapcraft <https://snapcraft.io/>`_ package. Flatpak and Snapcraft "
-"ensure that you'll always use the newest version and run OnionShare "
-"inside of a sandbox."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -57,12 +57,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -105,10 +105,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -119,8 +119,8 @@ msgstr ""
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -135,17 +135,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "Install on Windows or macOS"
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/zh_CN/LC_MESSAGES/security.po b/docs/source/locale/zh_CN/LC_MESSAGES/security.po
index 79923cda..05816266 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/security.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/security.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,8 +70,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -97,10 +97,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid "Security design"
@@ -210,3 +210,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/zh_CN/LC_MESSAGES/tor.po b/docs/source/locale/zh_CN/LC_MESSAGES/tor.po
index f8716f64..f73d3756 100644
--- a/docs/source/locale/zh_CN/LC_MESSAGES/tor.po
+++ b/docs/source/locale/zh_CN/LC_MESSAGES/tor.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-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"
@@ -70,9 +70,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -116,9 +116,9 @@ msgid ""
 "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\"."
+"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:61
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -412,3 +412,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+
diff --git a/docs/source/locale/zh_TW/LC_MESSAGES/install.po b/docs/source/locale/zh_TW/LC_MESSAGES/install.po
index 40be5554..89728307 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/install.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/install.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-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-10-12 15:26+0000\n"
 "Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>"
 "\n"
@@ -45,15 +45,15 @@ msgstr "使用Flatpak安裝到Linux"
 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."
+" the `Snap <https://snapcraft.io/>`_ package. Flatpak and Snap ensure "
+"that you'll always use the newest version and run OnionShare inside of a "
+"sandbox."
 msgstr ""
 
 #: ../../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."
+"Snap support is built-in to Ubuntu and Fedora comes with Flatpak support,"
+" but which you use is up to you. Both work in all Linux distributions."
 msgstr ""
 
 #: ../../source/install.rst:19
@@ -63,12 +63,12 @@ msgid ""
 msgstr ""
 
 #: ../../source/install.rst:21
-msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+msgid "**Install OnionShare using Snap**: https://snapcraft.io/onionshare"
 msgstr ""
 
 #: ../../source/install.rst:23
 msgid ""
-"You can also download and install a PGP-signed ``.flatpak`` or ``.snap`` "
+"You can also download and install PGP-signed ``.flatpak`` or ``.snap`` "
 "packages from https://onionshare.org/dist/ if you prefer."
 msgstr ""
 
@@ -111,10 +111,10 @@ msgstr ""
 
 #: ../../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 "
+"You can find the signatures (as ``.asc`` files), as well as Windows, "
+"macOS, Flatpak, Snap, 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 ""
 
@@ -125,8 +125,8 @@ msgstr "驗證中"
 #: ../../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::"
+"downloaded the binary and and ``.asc`` signature, you can verify the "
+"binary for macOS in a terminal like this::"
 msgstr ""
 
 #: ../../source/install.rst:53
@@ -141,17 +141,17 @@ msgstr ""
 msgid ""
 "If you don't see 'Good signature from', there might be a problem with the"
 " integrity of the file (malicious or otherwise), and you should not "
-"install the package. (The WARNING shown above, is not a problem with the "
-"package: it only means you haven't already defined any level of 'trust' "
-"of Micah's PGP key.)"
+"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:71
 msgid ""
-"If you want to learn more about verifying PGP signatures, guides for "
+"If you want to learn more about verifying PGP signatures, the 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."
+"signature/>`_ may be useful."
 msgstr ""
 
 #~ msgid "For added security, see :ref:`verifying_sigs`."
@@ -263,3 +263,74 @@ msgstr ""
 #~ "signatures.html.en>`_ may be helpful."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "There are various ways to install "
+#~ "OnionShare for Linux, but the "
+#~ "recommended way is to use either "
+#~ "the `Flatpak <https://flatpak.org/>`_ or the"
+#~ " `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 ""
+
+#~ 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 ""
+
+#~ msgid "**Install OnionShare using Snapcraft**: https://snapcraft.io/onionshare"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can also download and install "
+#~ "a PGP-signed ``.flatpak`` or ``.snap``"
+#~ " packages from https://onionshare.org/dist/ if"
+#~ " you prefer."
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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 ""
+
+#~ 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/source/locale/zh_TW/LC_MESSAGES/security.po b/docs/source/locale/zh_TW/LC_MESSAGES/security.po
index 55b831b1..28773be7 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/security.po
+++ b/docs/source/locale/zh_TW/LC_MESSAGES/security.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-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-10-22 12:26+0000\n"
 "Last-Translator: marklin0913 <marklin0913@protonmail.com>\n"
 "Language: zh_TW\n"
@@ -74,8 +74,8 @@ msgid ""
 "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 "
+"turn it off and make it public). The password is generated by choosing "
+"two random words from a list of 6800 words, making 6800², 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."
@@ -101,10 +101,10 @@ msgstr ""
 #: ../../source/security.rst:24
 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."
+"precautions must be taken to ensure the OnionShare address is "
+"communicated anonymously. A new email or chat account, only accessed over"
+" Tor, can be used to share the address. This isn't necessary unless "
+"anonymity is a goal."
 msgstr ""
 
 #~ msgid ""
@@ -206,3 +206,35 @@ msgstr ""
 #~ "know each other sharing work documents."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "**If an attacker learns about the "
+#~ "onion service, it still can't access "
+#~ "anything.** Prior attacks against the "
+#~ "Tor network to enumerate onion services"
+#~ " allowed the attacker to discover "
+#~ "private .onion addresses. If an attack"
+#~ " discovers a private OnionShare address,"
+#~ " 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 ""
+
+#~ 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/source/locale/zh_TW/LC_MESSAGES/tor.po b/docs/source/locale/zh_TW/LC_MESSAGES/tor.po
index 940b09f7..7ef0ae73 100644
--- a/docs/source/locale/zh_TW/LC_MESSAGES/tor.po
+++ b/docs/source/locale/zh_TW/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-11-15 14:42-0800\n"
+"POT-Creation-Date: 2020-12-13 15:48-0800\n"
 "PO-Revision-Date: 2020-10-12 15:26+0000\n"
 "Last-Translator: marklin0913da248e4cdada422a <marklin0913@protonmail.com>"
 "\n"
@@ -73,9 +73,9 @@ msgstr ""
 #: ../../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``."
+"<https://www.torproject.org/download/tor/>`_. Extract the compressed 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:32
@@ -119,9 +119,9 @@ msgid ""
 "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\"."
+"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:61
@@ -132,7 +132,7 @@ msgstr "在macOS系統中使用Tor"
 #: ../../source/tor.rst:63
 msgid ""
 "First, install `Homebrew <https://brew.sh/>`_ if you don't already have "
-"it. Then, install Tor::"
+"it, and then install Tor::"
 msgstr ""
 
 #: ../../source/tor.rst:67
@@ -408,3 +408,35 @@ msgstr ""
 #~ " the built-in obfs4 ones first."
 #~ msgstr ""
 
+#~ 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 ""
+
+#~ msgid ""
+#~ "Open OnionShare and click the \"⚙\" "
+#~ "icon in it. Under \"How should "
+#~ "OnionShare connect to Tor?\" choose "
+#~ "\"Connect using control port\", and set"
+#~ " \"Control port\" to ``127.0.0.1`` and "
+#~ "\"Port\" to ``9051``. Under \"Tor "
+#~ "authentication settings\" choose \"Password\" "
+#~ "and set the password to the "
+#~ "control port password you picked above"
+#~ " Click the \"Test Connection to Tor\""
+#~ " button. If all goes well, you "
+#~ "should see \"Connected to the Tor "
+#~ "controller\"."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "First, install `Homebrew <https://brew.sh/>`_ "
+#~ "if you don't already have it. "
+#~ "Then, install Tor::"
+#~ msgstr ""
+