diff options
| author | Micah Lee <micah@micahflee.com> | 2020-09-21 20:45:57 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2020-09-21 20:45:57 -0700 |
| commit | b93b3e8d1ae26a28e764f41066d67647fc7d29bf (patch) | |
| tree | d10349e3977f3085cb6fcde044fb2290ce7ce733 | |
| parent | f8f920b8a6e3ba15d562fbfa93fd5fbdfb46af43 (diff) | |
| download | onionshare-b93b3e8d1ae26a28e764f41066d67647fc7d29bf.tar.gz onionshare-b93b3e8d1ae26a28e764f41066d67647fc7d29bf.zip | |
Add back some strings, and force pyinstaller to include an import required for chat
| -rw-r--r-- | install/pyinstaller.spec | 2 | ||||
| -rw-r--r-- | share/locale/en.json | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/install/pyinstaller.spec b/install/pyinstaller.spec index 7eeb5153..a1774615 100644 --- a/install/pyinstaller.spec +++ b/install/pyinstaller.spec @@ -24,7 +24,7 @@ a = Analysis( ('../share/static/js/*', 'share/static/js'), ('../install/licenses/*', 'licenses') ], - hiddenimports=[], + hiddenimports=["engineio.async_drivers.threading"], hookspath=[], runtime_hooks=[], win_no_prefer_redirects=False, diff --git a/share/locale/en.json b/share/locale/en.json index fe880b61..b56c52d8 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -177,5 +177,15 @@ "gui_all_modes_transfer_finished_range": "Transferred {} - {}", "gui_all_modes_transfer_finished": "Transferred {}", "gui_all_modes_transfer_canceled_range": "Canceled {} - {}", - "gui_all_modes_transfer_canceled": "Canceled {}" + "gui_all_modes_transfer_canceled": "Canceled {}", + "settings_error_unknown": "Can't connect to Tor controller because your settings don't make sense.", + "settings_error_automatic": "Could not connect to the Tor controller. Is Tor Browser (available from torproject.org) running in the background?", + "settings_error_socket_port": "Can't connect to the Tor controller at {}:{}.", + "settings_error_socket_file": "Can't connect to the Tor controller using socket file {}.", + "settings_error_auth": "Connected to {}:{}, but can't authenticate. Maybe this isn't a Tor controller?", + "settings_error_missing_password": "Connected to Tor controller, but it requires a password to authenticate.", + "settings_error_unreadable_cookie_file": "Connected to the Tor controller, but password may be wrong, or your user is not permitted to read the cookie file.", + "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{}" }
\ No newline at end of file |