Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-10 23:30:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Onion now connects to the Tor controller using the settings in Settings (except automatic still needs some work), and the settings dialog handles error when testing settings

Browse source
This commit is contained in:
Micah Lee 2016-12-29 09:58:13 -08:00
parent 943e23658e
commit 19d020f245
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
4 changed files with 113 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/locale/en.json
View file

@ -70,7 +70,7 @@
"gui_settings_control_port_label": "Control port",
"gui_settings_socket_file_label": "Socket file",
"gui_settings_authenticate_label": "Tor authentication options",
"gui_settings_authenticate_no_auth_option": "No authentication",
"gui_settings_authenticate_no_auth_option": "No authentication, or cookie authentication",
"gui_settings_authenticate_password_option": "Password",
"gui_settings_authenticate_cookie_option": "Cookie",
"gui_settings_password_label": "Password",
@ -78,5 +78,10 @@
"gui_settings_button_test": "Test Settings",
"gui_settings_button_save": "Save",
"gui_settings_button_cancel": "Cancel",
"settings_saved": "Settings saved to {}"
"settings_saved": "Settings saved to {}",
"settings_error_unknown": "Can't connect to Tor controller because the settings don't make sense.",
"settings_error_socket_port": "Can't connect to Tor controller on address {} with port {}.",
"settings_error_socket_file": "Can't connect to Tor controller using socket file {}.",
"settings_error_missing_password": "Connected to Tor controller, but it requires a password to authenticate.",
"settings_error_unreadable_cookie_file": "Connected to Tor controller, but can't authenticate because your password may be wrong, and your user doesn't have permission to read the cookie file."
}