Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-03 11:56:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge master branch and fix conflicts

Browse source
This commit is contained in:
Miguel Jacq 2017-12-03 17:06:33 +11:00
commit f6763b25ef
15 changed files with 128 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
share/locale/en.json
View file

@ -118,5 +118,6 @@
"gui_tor_connection_ask_quit": "Quit",
"gui_tor_connection_error_settings": "Try adjusting how OnionShare connects to the Tor network in Settings.",
"gui_server_started_after_timeout": "The server started after your chosen auto-timeout.\nPlease start a new share.",
"gui_server_timeout_expired": "The chosen timeout has already expired.\nPlease update the timeout and then you may start sharing."
"gui_server_timeout_expired": "The chosen timeout has already expired.\nPlease update the timeout and then you may start sharing.",
"share_via_onionshare": "Share via OnionShare"
}