Merge branch 'develop' into v2.6-dev2

CHANGELOG.md

@@ -2,7 +2,13 @@
 
 ## 2.6
 
-* TODO
+* Major feature: a new 'Quickstart' screen, which enables toggling on or off an animated automatic connection to Tor. This allows configuring network settings prior to automatic connection.
+* Major feature: Censorship circumvention. Use new features in the upstream Tor API to try to automatically obtain bridges depending on the user's location.
+* New feature: automatically fetch the built-in bridges from the upstream Tor API rather than hardcode them in each release of OnionShare.
+* New feature: keyboard shortcuts to access various modes and menus, and accessibility hints
+* Bug fix: Temporary Directory for serving the OnionShare web pages was broken on Windows
+* Miscellaneous: many dependency updates, web page theming improvements, and packaging automation improvements.
+
 
 ## 2.5
 

RELEASE.md

@@ -44,7 +44,12 @@ Make sure snapcraft packaging works. In `snap/snapcraft.yaml`:
 
 - [ ] The `tor`, `libevent`, and `obfs4` parts should be updated if necessary
 - [ ] All python packages in the `onionshare` part should be updated to match `desktop/pyproject.toml`
-- [ ] Test the snap package, ensure it works
+- [ ] With every commit to the `develop` branch, Snapcraft's CI should trigger builds. Make sure the builds all succeeded at https://snapcraft.io/onionshare/builds (you must be logged in), and test them
+
+Update to the latest version of Tor:
+
+- [ ] Edit `desktop/scripts/get-tor.py` to use the latest version of Tor Browser, and the latest sha256 checksums.
+- [ ] Update the version of `meek`, `obfs4proxy`, and `snowflake` in the `desktop/scripts/build-pt-*` scripts, both the bash and PowerShell scripts.
 
 Finally:
 

desktop/onionshare/resources/locale/en.json

@@ -2,8 +2,8 @@
     "not_a_readable_file": "{0:s} is not a readable file.",
     "other_page_loaded": "Address loaded",
     "incorrect_password": "Incorrect password",
-    "close_on_autostop_timer": "Stopped because auto-stop timer ran out",
-    "closing_automatically": "Stopped because transfer is complete",
+    "close_on_autostop_timer": "Stopped because the auto-stop timer ran out",
+    "closing_automatically": "Stopped because the transfer is complete",
     "large_filesize": "Warning: Sending a large share could take hours",
     "gui_drag_and_drop": "Drag and drop files and folders to start sharing",
     "gui_add": "Add",
@@ -42,25 +42,25 @@
     "gui_please_wait": "Starting… Click to cancel.",
     "zip_progress_bar_format": "Compressing: %p%",
     "gui_tor_settings_window_title": "Tor Settings",
-    "gui_autoconnect_description": "OnionShare relies on the Tor Network, run by thousands of volunteers around the world.",
-    "gui_enable_autoconnect_checkbox": "Connect to Tor automatically",
-    "gui_autoconnect_failed_to_connect_to_tor": "Failed to Connect to Tor",
-    "gui_autoconnect_trying_to_connect_to_tor": "Trying to Connect to Tor...",
-    "gui_autoconnect_connection_error_msg": "Are you connected to the internet?",
-    "gui_autoconnect_bridge_description": "It's also possible that your internet is being censored. You might be able to bypass this using a bridge.",
-    "gui_autoconnect_bridge_detect_automatic": "Automatically determine my country from my IP address for bridge settings",
-    "gui_autoconnect_bridge_detect_manual": "Manually select my country for bridge settings",
+    "gui_autoconnect_description": "OnionShare relies on the volunteer-operated Tor network.",
+    "gui_enable_autoconnect_checkbox": "Auto-connect to Tor",
+    "gui_autoconnect_failed_to_connect_to_tor": "Could not connect to Tor",
+    "gui_autoconnect_trying_to_connect_to_tor": "Connecting to Tor…",
+    "gui_autoconnect_connection_error_msg": "Make sure you are connected to the Internet.",
+    "gui_autoconnect_bridge_description": "You might be able to connect using a bridge if your Internet connection is censored.",
+    "gui_autoconnect_bridge_detect_automatic": "Determine my country from my IP address for bridge settings",
+    "gui_autoconnect_bridge_detect_manual": "Select my country for bridge settings manually",
     "gui_autoconnect_bridge_setting_options": "Bridge Settings",
     "gui_autoconnect_start": "Connect to Tor",
     "gui_autoconnect_configure": "Network Settings",
-    "gui_autoconnect_no_bridge": "Try again without bridge",
-    "gui_autoconnect_try_again_without_a_bridge": "Try again without a Bridge",
-    "gui_autoconnect_circumventing_censorship": "Trying to resolve connectivity issues",
-    "gui_autoconnect_circumventing_censorship_starting_circumvention": "Starting censorship circumvention process",
-    "gui_autoconnect_circumventing_censorship_starting_meek": "Starting Meek for domain-fronting",
-    "gui_autoconnect_circumventing_censorship_requesting_bridges": "Requesting bridges from the Tor Censorship Circumvention API",
-    "gui_autoconnect_circumventing_censorship_got_bridges": "Got bridges! Trying to reconnect to Tor",
-    "gui_autoconnect_could_not_connect_to_tor_api": "Could not connect to the Tor API. Make sure you are connected to the internet before trying again.",
+    "gui_autoconnect_no_bridge": "Try again without bridges",
+    "gui_autoconnect_try_again_without_a_bridge": "Try again without bridges",
+    "gui_autoconnect_circumventing_censorship": "Resolving connectivity issues…",
+    "gui_autoconnect_circumventing_censorship_starting_circumvention": "Circumventing censorship…",
+    "gui_autoconnect_circumventing_censorship_starting_meek": "Establishing meek bridge for domain-fronting…",
+    "gui_autoconnect_circumventing_censorship_requesting_bridges": "Requesting bridges from the Tor censorship circumvention API…",
+    "gui_autoconnect_circumventing_censorship_got_bridges": "Bridges established. Reconnecting to Tor…",
+    "gui_autoconnect_could_not_connect_to_tor_api": "Could not connect to the Tor API. Make sure you are connected to the Internet before trying again.",
     "gui_settings_window_title": "Settings",
     "gui_general_settings_window_title": "General",
     "gui_settings_autoupdate_label": "Check for new version",
@@ -82,10 +82,10 @@
     "gui_settings_authenticate_password_option": "Password",
     "gui_settings_password_label": "Password",
     "gui_settings_tor_bridges": "Connect using a Tor bridge?",
-    "gui_settings_tor_bridges_label": "Bridges helps your traffic enter the Tor Network where Tor access is blocked. Depending on where you are, one bridge may work better than another.",
+    "gui_settings_tor_bridges_label": "Bridges help your traffic enter the Tor Network if Tor access is blocked. Depending on where you connect from, one bridge may work better than another.",
     "gui_settings_bridge_use_checkbox": "Use a bridge",
     "gui_settings_bridge_radio_builtin": "Select a built-in bridge",
-    "gui_settings_bridge_none_radio_option": "Don't use a bridge",
+    "gui_settings_bridge_none_radio_option": "Don't use bridges",
     "gui_settings_meek_lite_expensive_warning": "Warning: The meek-azure bridges are very costly for the Tor Project to run.<br><br>Only use them if unable to connect to Tor directly, via obfs4 transports, or other normal bridges.",
     "gui_settings_bridge_moat_radio_option": "Request a bridge from torproject.org",
     "gui_settings_bridge_moat_button": "Request a New Bridge",
@@ -115,7 +115,7 @@
     "gui_server_autostop_timer_expired": "The auto-stop timer already ran out. Please adjust it to start sharing.",
     "gui_server_autostart_timer_expired": "The scheduled time has already passed. Please adjust it to start sharing.",
     "gui_autostop_timer_cant_be_earlier_than_autostart_timer": "The auto-stop time can't be the same or earlier than the auto-start time. Please adjust it to start sharing.",
-    "gui_server_doesnt_support_stealth": "Sorry, this version of Tor doesn't support stealth (Client Authentication). Please try with a newer version of Tor, or use 'public' mode if it doesn't need to be private.",
+    "gui_server_doesnt_support_stealth": "Sorry, this version of Tor doesn't support stealth (client authentication). Please try with a newer version of Tor, or use 'public' mode if it doesn't need to be private.",
     "share_via_onionshare": "Share via OnionShare",
     "gui_share_url_description": "<b>Anyone</b> with this OnionShare address and private key can <b>download</b> your files using the <b>Tor Browser</b>: <img src='{}' />",
     "gui_share_url_public_description": "<b>Anyone</b> with this OnionShare address can <b>download</b> your files using the <b>Tor Browser</b>: <img src='{}' />",
@@ -199,21 +199,21 @@
     "gui_tab_name_receive": "Receive",
     "gui_tab_name_website": "Website",
     "gui_tab_name_chat": "Chat",
-    "gui_close_tab_warning_title": "Are you sure?",
+    "gui_close_tab_warning_title": "Close tab?",
     "gui_close_tab_warning_persistent_description": "Close persistent tab and lose the onion address it is using?",
     "gui_close_tab_warning_share_description": "Close tab that is sending files?",
     "gui_close_tab_warning_receive_description": "Close tab that is receiving files?",
     "gui_close_tab_warning_website_description": "Close tab that is hosting a website?",
     "gui_close_tab_warning_close": "Close",
     "gui_close_tab_warning_cancel": "Cancel",
-    "gui_quit_warning_title": "Are you sure?",
+    "gui_quit_warning_title": "Quit OnionShare?",
     "gui_quit_warning_description": "Quit and close all tabs, even though sharing is active in some of them?",
     "gui_quit_warning_quit": "Quit",
     "gui_quit_warning_cancel": "Cancel",
     "mode_settings_advanced_toggle_show": "Show advanced settings",
     "mode_settings_advanced_toggle_hide": "Hide advanced settings",
     "mode_settings_title_label": "Custom title",
-    "mode_settings_persistent_checkbox": "Save this tab, and automatically open it when I open OnionShare",
+    "mode_settings_persistent_checkbox": "Always open this tab when OnionShare is started",
     "mode_settings_public_checkbox": "This is a public OnionShare service (disables private key)",
     "mode_settings_autostart_timer_checkbox": "Start onion service at scheduled time",
     "mode_settings_autostop_timer_checkbox": "Stop onion service at scheduled time",
@@ -253,4 +253,4 @@
     "moat_captcha_error": "Incorrect solution. Please try again.",
     "moat_solution_empty_error": "Enter the characters from the image",
     "mode_tor_not_connected_label": "OnionShare is not connected to the Tor network"
-}
+}

docs/gettext/advanced.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\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"
@@ -123,3 +123,15 @@ msgstr ""
 #: ../../source/advanced.rst:91
 msgid "Browse the command-line documentation by running ``onionshare --help``::"
 msgstr ""
+
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid "The OnionShare desktop application contains some keyboard shortcuts, for convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""

docs/gettext/connecting.pot

@@ -0,0 +1,113 @@
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: OnionShare 2.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-31 16:39+1100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../source/connecting.rst:2
+msgid "Getting connected to Tor"
+msgstr ""
+
+#: ../../source/connecting.rst:4
+msgid "When OnionShare starts, it will present a screen asking you to connect to the Tor network."
+msgstr ""
+
+#: ../../source/connecting.rst:8
+msgid "You have several choices. You can click Connect to Tor to begin the connection process. If there are no problems with your network, including any attempts to block your access to the Tor network, this should hopefully work the first time."
+msgstr ""
+
+#: ../../source/connecting.rst:10
+msgid "If you want to manually configure Bridges or other Tor settings before you connect, you can click 'Network Settings'."
+msgstr ""
+
+#: ../../source/connecting.rst:13
+msgid "Automatic censorship circumvention"
+msgstr ""
+
+#: ../../source/connecting.rst:15
+msgid "When OnionShare fails to connect to Tor, it might be because Tor is censored in your country."
+msgstr ""
+
+#: ../../source/connecting.rst:17
+msgid "If this occurs, a screen will be displayed that will offer you to either 'Use a Bridge' (automatically choosing one for you), or 'Try Again without a Bridge'."
+msgstr ""
+
+#: ../../source/connecting.rst:22
+msgid "What 'Use a Bridge' does"
+msgstr ""
+
+#: ../../source/connecting.rst:24
+msgid "Bridges are a way to connect to the Tor network via intermediate services that are hopefully not blocked by your network provider (whereas normal connections might be)."
+msgstr ""
+
+#: ../../source/connecting.rst:26
+msgid "Clicking 'Use a Bridge' will temporarily use the `Meek <https://gitlab.torproject.org/legacy/trac/-/wikis/doc/meek/>`_ domain-fronting proxy to make a non-Tor connection from your computer to the Tor Project's Censorship Circumvention API. The use of the Meek proxy is to hide the fact that you are trying to find a way to connect to Tor."
+msgstr ""
+
+#: ../../source/connecting.rst:28
+msgid "Before clicking 'Use a Bridge', you can choose either 'Automatically determine my country from my IP address' or 'Manually select my country'."
+msgstr ""
+
+#: ../../source/connecting.rst:30
+msgid "If you choose the former option, the Censorship Circumvention API will consider your IP address (yes, your real IP address) to determine what country you might reside in."
+msgstr ""
+
+#: ../../source/connecting.rst:32
+msgid "Based on the country information, the API will try to automatically find bridges that suit your location."
+msgstr ""
+
+#: ../../source/connecting.rst:36
+msgid "If you choose to manually select a country, OnionShare will still make a request to the Censorship Circumvention API, but will tell the API the country code. The API will then try to fetch bridges for that country that you specified."
+msgstr ""
+
+#: ../../source/connecting.rst:38
+msgid "If it finds any such bridges, OnionShare will try to reconnect to Tor using those bridges."
+msgstr ""
+
+#: ../../source/connecting.rst:40
+msgid "If the API does not find any bridges for your location, OnionShare will ask the API for 'fallback' options. At the time of writing, this is likely to be the obfs4 built-in bridges."
+msgstr ""
+
+#: ../../source/connecting.rst:42
+msgid "OnionShare will also attempt to use the obfs4 built-in bridges if for some reason it could not connect to the API itself, or the API returned an error."
+msgstr ""
+
+#: ../../source/connecting.rst:44
+msgid "It's important to note that the requests to the Censorship Circumvention API do not go over the Tor Network (because if you could connect to Tor already, you wouldn't need to connect to the API)."
+msgstr ""
+
+#: ../../source/connecting.rst:46
+msgid "Even though it is hard for an adversary to discover where the Meek request is going, this may still be risky for some users. Therefore, it is an opt-in feature. The use of Meek and non-torified network requests are limited only to making one or two requests to the Censorship Circumvention API. Then Meek is stopped, and all further network requests happen over the Tor network."
+msgstr ""
+
+#: ../../source/connecting.rst:49
+msgid "What 'Try again without a Bridge' does"
+msgstr ""
+
+#: ../../source/connecting.rst:51
+msgid "Clicking 'Try again without a Bridge' will retry the normal OnionShare connection attempt to Tor. It won't talk to the Tor Censorship Circumvention API or use Meek."
+msgstr ""
+
+#: ../../source/connecting.rst:54
+msgid "Connect to Tor automatically"
+msgstr ""
+
+#: ../../source/connecting.rst:56
+msgid "You can toggle on the switch 'Connect to Tor automatically' before clicking 'Connect to Tor'. This means that next time OnionShare starts, it will automatically connect with its Tor connection settings from the last session, instead of presenting you with the connection options."
+msgstr ""
+
+#: ../../source/connecting.rst:58
+msgid "If the connection fails, you can still try bridges or reconfigure Tor via the 'Network Settings'."
+msgstr ""

docs/gettext/develop.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/gettext/features.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/gettext/help.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/gettext/index.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/gettext/install.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/gettext/security.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/gettext/sphinx.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/gettext/tor.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-04 17:16-0400\n"
+"POT-Creation-Date: 2022-07-05 10:22+1000\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"

docs/source/advanced.rst

@@ -6,12 +6,10 @@ Advanced Usage
 Save Tabs
 ---------
 
-Everything in OnionShare is temporary by default. When OnionShare tabs are closed, addresses no longer exist and can't be used again.
-Your OnionShare service can also be persistent.
-If you host a website, persistence means it will be available on the same OnionShare address even if you reboot your computer.
+Closing OnionShare tabs you host destroys them, preventing reuse.
+Persistently hosted websites are available on the same address even if the computer they are shared from is rebooted.
 
-To make any tab persistent, check the "Save this tab, and automatically open it when I open OnionShare" box before starting your server.
-A purple pin icon appears to the left of its server status to tell you the tab is saved.
+Make any tab persistent by checking the "Always open this tab when OnionShare is started" box before starting your server.
 
 .. image:: _static/screenshots/advanced-save-tabs.png
 
@@ -146,3 +144,21 @@ Browse the command-line documentation by running ``onionshare --help``::
       --disable_csp             Publish website: Disable the default Content Security Policy header (allows your website to use third-party resources)
       --custom_csp custom_csp   Publish website: Set a custom Content Security Policy header
       -v, --verbose             Log OnionShare errors to stdout, and web errors to disk
+
+
+
+Keyboard Shortcuts
+------------------
+
+The OnionShare desktop application contains some keyboard shortcuts, for convenience and accessibility::
+
+    Ctrl T - New Tab
+    Ctrl X - Closes current tab
+
+And from the main mode chooser screen::
+
+    Ctrl S - Share mode
+    Ctrl R - Receive mode
+    Ctrl W - Website mode
+    Ctrl C - Chat mode
+    Ctrl H - Settings tab

docs/source/locale/de/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-12-04 15:52+0000\n"
 "Last-Translator: Jannes Leßmann <janneslessmann@web.de>\n"
 "Language: de\n"
@@ -239,6 +239,20 @@ msgstr ""
 "Die Dokumentation zur Kommandozeile kann über den Befehl ``onionshare "
 "--help`` abgerufen werden::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -593,3 +607,22 @@ msgstr ""
 #~ "kannst du den Dienst deaktvieren, bevor"
 #~ " er gemäß Zeitsteuerung starten würde."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/el/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-10-09 09:04+0000\n"
 "Last-Translator: george kitsoukakis <norhorn@gmail.com>\n"
 "Language: el\n"
@@ -235,6 +235,20 @@ msgstr ""
 "Μπορείτε να περιηγηθείτε στην τεκμηρίωση της γραμμής εντολών με "
 "``onionshare --help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -670,3 +684,22 @@ msgstr ""
 #~ "συμβεί τίποτα μπορείτε να ακυρώσετε την"
 #~ " υπηρεσία πριν αυτή ξεκινήσει."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

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

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\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"
@@ -181,6 +181,20 @@ msgstr ""
 msgid "Browse the command-line documentation by running ``onionshare --help``::"
 msgstr ""
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -627,3 +641,22 @@ msgstr ""
 #~ "--help``::"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/es/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-10-08 07:03+0000\n"
 "Last-Translator: Username1234567890 <danarauz@protonmail.com>\n"
 "Language: es\n"
@@ -235,6 +235,20 @@ msgstr ""
 "Puedes navegar la documentación de línea de comando ejecutando "
 "``onionshare --help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid ""
 #~ "By default, everything in OnionShare is"
 #~ " temporary. As soon as you close "
@@ -594,3 +608,22 @@ msgstr ""
 #~ "pasa nada, puedes cancelarlo antes de"
 #~ " su inicio programado."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-10-23 18:43+0000\n"
 "Last-Translator: aezjrareareare <jeromechaland@riseup.net>\n"
 "Language: fr\n"
@@ -209,6 +209,20 @@ msgstr ""
 "Vous pouvez consultez la documentation de l'interface en ligne de "
 "commande en lançant ``onionshare --help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -638,3 +652,22 @@ msgstr ""
 #~ " in the git repository."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/it/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2020-12-02 19:29+0000\n"
 "Last-Translator: x <hardwired1.0@protonmail.com>\n"
 "Language: it\n"
@@ -214,6 +214,20 @@ msgstr ""
 "Puoi sfogliare la documentazione della riga di comando eseguendo "
 "``onionshare --help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -675,3 +689,22 @@ msgstr ""
 #~ " in the git repository."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OnionShare 2.3\n"
 "Report-Msgid-Bugs-To: onionshare-dev@lists.riseup.net\n"
-"POT-Creation-Date: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2022-02-14 08:55+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language: nb_NO\n"
@@ -233,6 +233,20 @@ msgstr ""
 "Du kan utforske kommandolinje-dokumentasjonen ved å kjøre ``onionshare "
 "--help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -653,3 +667,22 @@ msgstr ""
 #~ "du avbryte tjenesten før dens planlagte"
 #~ " oppstart."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/pl/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-10-16 21:34+0000\n"
 "Last-Translator: Rafał Godek <p3run@tutanota.com>\n"
 "Language: pl\n"
@@ -234,6 +234,20 @@ msgstr ""
 "Możesz przeglądać dokumentację wiersza poleceń, uruchamiając ``onionshare"
 " --help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -643,3 +657,22 @@ msgstr ""
 #~ "możesz anulować usługę przed planowanym "
 #~ "rozpoczęciem."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/pt_BR/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-12-02 14:52+0000\n"
 "Last-Translator: Venilson Carneiro <venilsoncarneiro@pm.me>\n"
 "Language: pt_BR\n"
@@ -233,6 +233,20 @@ msgstr ""
 "Você pode navegar pela documentação da linha de comando executando `` "
 "onionshare --help`` ::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -649,3 +663,22 @@ msgstr ""
 #~ "pode cancelar o serviço antes do "
 #~ "programado para iniciar."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/ru/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-09-23 15:36+0000\n"
 "Last-Translator: Alexander Tarasenko <alexound.login@gmail.com>\n"
 "Language: ru\n"
@@ -46,8 +46,8 @@ msgid ""
 msgstr ""
 "Чтобы сделать любую вкладку постоянной, отметьте пункт \"Сохранить эту "
 "вкладку, и открывать ее автоматически при открытии OnionShare\" перед "
-"запуском сервера. При сохранении вкладки появится иконка сиреневого цвета с "
-"изображением булавки слева от статуса сервера."
+"запуском сервера. При сохранении вкладки появится иконка сиреневого цвета"
+" с изображением булавки слева от статуса сервера."
 
 #: ../../source/advanced.rst:18
 msgid ""
@@ -63,8 +63,8 @@ msgid ""
 "If you save a tab, a copy of its onion service secret key is stored on "
 "your computer."
 msgstr ""
-"При сохранении вкладки копия ключа onion-сервиса также будет сохранена на "
-"компьютере вместе с настройками OnionShare."
+"При сохранении вкладки копия ключа onion-сервиса также будет сохранена на"
+" компьютере вместе с настройками OnionShare."
 
 #: ../../source/advanced.rst:26
 msgid "Turn Off Private Key"
@@ -75,8 +75,8 @@ msgid ""
 "By default, all OnionShare services are protected with a private key, "
 "which Tor calls \"client authentication\"."
 msgstr ""
-"По умолчанию все сервисы OnionShare защищены секретным ключом, который на "
-"сленге Tor называется \"клиентская аутентификация\"."
+"По умолчанию все сервисы OnionShare защищены секретным ключом, который на"
+" сленге Tor называется \"клиентская аутентификация\"."
 
 #: ../../source/advanced.rst:30
 msgid ""
@@ -135,10 +135,11 @@ msgid ""
 "set the respective desired dates and times."
 msgstr ""
 "OnionShare поддерживает возможность точного планирования, когда сервис "
-"должен запуститься или остановиться. Перед запуском сервера, нажмите на его "
-"вкладке кнопку \"Показать дополнительные настройки\", отметьте нужные пункты:"
-" \"Запустить onion-сервис в назначенное время\", \"Остановить onion-сервис в "
-"назначенное время\", и укажите нужную дату и время для каждого пункта."
+"должен запуститься или остановиться. Перед запуском сервера, нажмите на "
+"его вкладке кнопку \"Показать дополнительные настройки\", отметьте нужные"
+" пункты: \"Запустить onion-сервис в назначенное время\", \"Остановить "
+"onion-сервис в назначенное время\", и укажите нужную дату и время для "
+"каждого пункта."
 
 #: ../../source/advanced.rst:53
 msgid ""
@@ -234,6 +235,20 @@ msgstr ""
 "Чтобы просмотреть документацию консольной версии OnionShare запустите "
 "команду: ``onionshare --help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -661,3 +676,22 @@ msgstr ""
 #~ " исчезнет, отправитель сможет остановить "
 #~ "таймер до автоматического запуска."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/tr/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-10-02 12:36+0000\n"
 "Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
 "Language: tr\n"
@@ -233,6 +233,20 @@ msgstr ""
 "``onionshare --help`` komutunu çalıştırarak komut satırı "
 "belgelendirmesine göz atabilirsiniz::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid "Make a symbolic link to the OnionShare command line binary line this::"
 #~ msgstr ""
 
@@ -663,3 +677,22 @@ msgstr ""
 #~ "olmazsa, hizmetin başlama zamanından önce "
 #~ "iptal edebilirsiniz."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

docs/source/locale/uk/LC_MESSAGES/advanced.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: 2022-03-31 16:26+1100\n"
+"POT-Creation-Date: 2022-07-05 10:24+1000\n"
 "PO-Revision-Date: 2021-09-11 01:40+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
 "Language: uk\n"
@@ -231,6 +231,20 @@ msgstr ""
 "Ви можете переглянути документацію командного рядка, запустивши "
 "``onionshare --help``::"
 
+#: ../../source/advanced.rst:153
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../source/advanced.rst:155
+msgid ""
+"The OnionShare desktop application contains some keyboard shortcuts, for "
+"convenience and accessibility::"
+msgstr ""
+
+#: ../../source/advanced.rst:160
+msgid "And from the main mode chooser screen::"
+msgstr ""
+
 #~ msgid ""
 #~ "By default, everything in OnionShare is"
 #~ " temporary. As soon as you close "
@@ -576,3 +590,22 @@ msgstr ""
 #~ " ви можете вимкнути службу до "
 #~ "запланованого запуску."
 
+#~ msgid ""
+#~ "The OnionShare desktop application contains"
+#~ " some keyboard shortcuts, for convenience"
+#~ " and accessibility."
+#~ msgstr ""
+
+#~ msgid "Ctrl T - New Tab Ctrl X - Closes current tab"
+#~ msgstr ""
+
+#~ msgid "And from the main mode chooser screen:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Ctrl S - Share mode Ctrl R -"
+#~ " Receive mode Ctrl W - Website "
+#~ "mode Ctrl C - Chat mode Ctrl "
+#~ "H - Settings tab"
+#~ msgstr ""
+

snap/snapcraft.yaml

@@ -12,9 +12,9 @@ grade: stable # stable or devel
 confinement: strict
 
 architectures:
-- build-on: amd64
-- build-on: arm64
-- build-on: armhf
+  - build-on: amd64
+  - build-on: arm64
+  - build-on: armhf
 
 apps:
   onionshare:
@@ -45,15 +45,11 @@ parts:
   onionshare:
     source: ./desktop
     plugin: python
-    python-version: python3
     python-packages:
-      - setuptools
       - qrcode
       - pyside2 == 5.15.2.1
-    # Force using setup.py, prevent using setup-freeze.py or poetry
     override-build: |
-      rm setup-freeze.py pyproject.toml poetry.lock || true
-      snapcraftctl build
+      python3 setup.py install --prefix $SNAPCRAFT_PART_INSTALL
     stage-packages:
       - libasound2
       - libatk1.0-0
@@ -69,7 +65,7 @@ parts:
       - libglx0
       - libgtk-3-0
       - libharfbuzz0b
-      - libicu60
+      - libicu66
       - libjpeg8
       - liblcms2-2
       - libnspr4
@@ -121,7 +117,6 @@ parts:
   onionshare-cli:
     source: ./cli
     plugin: python
-    python-version: python3
     python-packages:
       - poetry
     stage-packages:
@@ -129,10 +124,12 @@ parts:
       - libssl-dev
       - libffi-dev
       - python3-dev
+      - python3-pip
       - cargo
-    stage:
-      - -usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
-      - -usr/share/doc/libssl1.1/changelog.Debian.gz
+    override-build: |
+      poetry install
+      poetry build
+      pip3 install ./dist/onionshare_cli-*.whl --prefix $SNAPCRAFT_PART_INSTALL
     after: [tor, obfs4, snowflake-client, meek-client]
 
   tor:
@@ -140,6 +137,8 @@ parts:
     source-checksum: sha256/9e9a5c67ad2acdd5f0f8be14ed591fed076b1708abf8344066990a0fa66fe195
     source-type: tar
     plugin: autotools
+    autotools-configure-parameters:
+      - "--with-libevent-dir=/root/parts/libevent/install/usr/local"
     build-packages:
       - libssl-dev
       - zlib1g-dev
@@ -153,13 +152,11 @@ parts:
 
   obfs4:
     plugin: go
-    go-importpath: gitlab.com/yawning/obfs4
-    source: https://gitlab.com/yawning/obfs4
+    source: https://gitlab.com/yawning/obfs4.git
     source-type: git
 
   snowflake-client:
     plugin: go
-    go-importpath: git.torproject.org/pluggable-transports/snowflake.git/client
     source: https://git.torproject.org/pluggable-transports/snowflake.git
     source-type: git
     source-tag: v2.2.0
@@ -168,13 +165,10 @@ parts:
 
   meek-client:
     plugin: go
-    go-channel: stable
-    go-importpath: git.torproject.org/pluggable-transports/meek.git/meek-client
-    # Not sure why I have to do this, but it works
+    source: https://git.torproject.org/pluggable-transports/meek.git
+    source-type: git
+    source-tag: v0.37.0
     override-build: |
       cd meek-client
       mkdir /root/parts/meek-client/install/bin
       go build -o /root/parts/meek-client/install/bin/meek-client ./...
-    source: https://git.torproject.org/pluggable-transports/meek.git
-    source-type: git
-    source-tag: v0.37.0