Merge pull request #1602 from comradekingu/patch-19

New strings reworked

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",
+    "close_on_autostop_timer": "Stopped because the auto-stop timer ran out",
-    "closing_automatically": "Stopped because transfer is complete",
+    "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_autoconnect_description": "OnionShare relies on the volunteer-operated Tor network.",
-    "gui_enable_autoconnect_checkbox": "Connect to Tor automatically",
+    "gui_enable_autoconnect_checkbox": "Auto-connect to Tor",
-    "gui_autoconnect_failed_to_connect_to_tor": "Failed to Connect to Tor",
+    "gui_autoconnect_failed_to_connect_to_tor": "Could not connect to Tor",
-    "gui_autoconnect_trying_to_connect_to_tor": "Trying to Connect to Tor...",
+    "gui_autoconnect_trying_to_connect_to_tor": "Connecting to Tor…",
-    "gui_autoconnect_connection_error_msg": "Are you connected to the internet?",
+    "gui_autoconnect_connection_error_msg": "Make sure you are 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_description": "You might be able to connect using a bridge if your Internet connection is censored.",
-    "gui_autoconnect_bridge_detect_automatic": "Automatically determine my country from my IP address for bridge settings",
+    "gui_autoconnect_bridge_detect_automatic": "Determine my country from my IP address for bridge settings",
-    "gui_autoconnect_bridge_detect_manual": "Manually select my country 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_no_bridge": "Try again without bridges",
-    "gui_autoconnect_try_again_without_a_bridge": "Try again without a Bridge",
+    "gui_autoconnect_try_again_without_a_bridge": "Try again without bridges",
-    "gui_autoconnect_circumventing_censorship": "Trying to resolve connectivity issues",
+    "gui_autoconnect_circumventing_censorship": "Resolving connectivity issues…",
-    "gui_autoconnect_circumventing_censorship_starting_circumvention": "Starting censorship circumvention process",
+    "gui_autoconnect_circumventing_censorship_starting_circumvention": "Circumventing censorship…",
-    "gui_autoconnect_circumventing_censorship_starting_meek": "Starting Meek for domain-fronting",
+    "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_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_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_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/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.
+Closing OnionShare tabs you host destroys them, preventing reuse.
-Your OnionShare service can also be persistent.
+Persistently hosted websites are available on the same address even if the computer they are shared from is rebooted.
-If you host a website, persistence means it will be available on the same OnionShare address even if you reboot your computer.
 
-To make any tab persistent, check the "Save this tab, and automatically open it when I open OnionShare" box before starting your server.
+Make any tab persistent by checking the "Always open this tab when OnionShare is started" box before starting your server.
-A purple pin icon appears to the left of its server status to tell you the tab is saved.
 
 .. image:: _static/screenshots/advanced-save-tabs.png