Resolve conflicts in locale

1 files changed, 29 insertions, 14 deletions

diff --git a/desktop/src/onionshare/resources/locale/en.json b/desktop/src/onionshare/resources/locale/en.json
index 437a3eda..db5fbfe5 100644
--- a/desktop/src/onionshare/resources/locale/en.json
+++ b/desktop/src/onionshare/resources/locale/en.json
@@ -40,6 +40,7 @@
     "gui_please_wait_no_button": "Starting…",
     "gui_please_wait": "Starting… Click to cancel.",
     "zip_progress_bar_format": "Compressing: %p%",
+    "gui_tor_settings_window_title": "Tor Settings",
     "gui_settings_window_title": "Settings",
     "gui_settings_autoupdate_label": "Check for new version",
     "gui_settings_autoupdate_option": "Notify me when a new version is available",
@@ -49,29 +50,34 @@
     "gui_settings_connection_type_label": "How should OnionShare connect to Tor?",
     "gui_settings_connection_type_bundled_option": "Use the Tor version built into OnionShare",
     "gui_settings_connection_type_automatic_option": "Attempt auto-configuration with Tor Browser",
+    "gui_settings_controller_extras_label": "Tor settings",
     "gui_settings_connection_type_control_port_option": "Connect using control port",
     "gui_settings_connection_type_socket_file_option": "Connect using socket file",
     "gui_settings_connection_type_test_button": "Test Connection to Tor",
     "gui_settings_control_port_label": "Control port",
     "gui_settings_socket_file_label": "Socket file",
     "gui_settings_socks_label": "SOCKS port",
-    "gui_settings_authenticate_label": "Tor authentication settings",
     "gui_settings_authenticate_no_auth_option": "No authentication, or cookie authentication",
     "gui_settings_authenticate_password_option": "Password",
     "gui_settings_password_label": "Password",
-    "gui_settings_tor_bridges": "Tor bridge support",
-    "gui_settings_tor_bridges_no_bridges_radio_option": "Don't use bridges",
-    "gui_settings_tor_bridges_obfs4_radio_option": "Use built-in obfs4 pluggable transports",
-    "gui_settings_tor_bridges_obfs4_radio_option_no_obfs4proxy": "Use built-in obfs4 pluggable transports (requires obfs4proxy)",
-    "gui_settings_tor_bridges_meek_lite_azure_radio_option": "Use built-in meek_lite (Azure) pluggable transports",
-    "gui_settings_tor_bridges_meek_lite_azure_radio_option_no_obfs4proxy": "Use built-in meek_lite (Azure) pluggable transports (requires obfs4proxy)",
-    "gui_settings_meek_lite_expensive_warning": "Warning: The meek_lite 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_tor_bridges_custom_radio_option": "Use custom bridges",
-    "gui_settings_tor_bridges_custom_label": "You can get bridges from <a href=\"https://bridges.torproject.org/options\">https://bridges.torproject.org</a>",
-    "gui_settings_tor_bridges_invalid": "None of the bridges you added work.\nDouble-check them or add others.",
+    "gui_settings_tor_bridges": "Connect using a Tor bridge?",
+    "gui_settings_tor_bridges_label": "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, 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_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",
+    "gui_settings_bridge_custom_radio_option": "Provide a bridge you learned about from a trusted source",
+    "gui_settings_bridge_custom_placeholder": "type address:port (one per line)",
+    "gui_settings_moat_bridges_invalid": "You have not requested a bridge from torproject.org yet.",
+    "gui_settings_tor_bridges_invalid": "None of the bridges you added work. Double-check them or add others.",
+    "gui_settings_stop_active_tabs_label": "There are services running in some of your tabs.\nYou must stop all services to change your Tor settings.",
     "gui_settings_button_save": "Save",
     "gui_settings_button_cancel": "Cancel",
     "gui_settings_button_help": "Help",
+    "gui_settings_version_label": "You are using OnionShare {}",
+    "gui_settings_help_label": "Need help? See <a href='https://docs.onionshare.org'>docs.onionshare.org</a>",
     "settings_test_success": "Connected to the Tor controller.\n\nTor version: {}\nSupports ephemeral onion services: {}.\nSupports client authentication: {}.\nSupports next-gen .onion addresses: {}.",
     "connecting_to_tor": "Connecting to the Tor network",
     "update_available": "New OnionShare out. <a href='{}'>Click here</a> to get it.<br><br>You are using {} and the latest is {}.",
@@ -125,7 +131,7 @@
     "error_cannot_create_data_dir": "Could not create OnionShare data folder: {}",
     "gui_receive_mode_warning": "Receive mode lets people upload files to your computer.<br><br><b>Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.</b>",
     "gui_open_folder_error": "Failed to open folder with xdg-open. The file is here: {}",
-    "gui_settings_language_label": "Preferred language",
+    "gui_settings_language_label": "Language",
     "gui_settings_theme_label": "Theme",
     "gui_settings_theme_auto": "Auto",
     "gui_settings_theme_light": "Light",
@@ -197,7 +203,7 @@
     "mode_settings_receive_disable_files_checkbox": "Disable uploading files",
     "mode_settings_receive_webhook_url_checkbox": "Use notification webhook",
     "mode_settings_website_disable_csp_checkbox": "Don't send default Content Security Policy header (allows your website to use third-party resources)",
-    "mode_settings_website_custom_csp_checkbox": "Send a Custom Content Security Policy header",
+    "mode_settings_website_custom_csp_checkbox": "Send a custom Content Security Policy header",
     "gui_all_modes_transfer_finished_range": "Transferred {} - {}",
     "gui_all_modes_transfer_finished": "Transferred {}",
     "gui_all_modes_transfer_canceled_range": "Canceled {} - {}",
@@ -216,5 +222,14 @@
     "gui_rendezvous_cleanup_quit_early": "Quit Early",
     "error_port_not_available": "OnionShare port not available",
     "history_receive_read_message_button": "Read Message",
-    "error_tor_protocol_error": "There was an error with Tor: {}"
+    "error_tor_protocol_error": "There was an error with Tor: {}",
+    "moat_contact_label": "Contacting BridgeDB...",
+    "moat_captcha_label": "Solve the CAPTCHA to request a bridge.",
+    "moat_captcha_placeholder": "Enter the characters from the image",
+    "moat_captcha_submit": "Submit",
+    "moat_captcha_reload": "Reload",
+    "moat_bridgedb_error": "Error contacting BridgeDB.",
+    "moat_captcha_error": "The solution is not correct. Please try again.",
+    "moat_solution_empty_error": "You must enter the characters from the image",
+    "mode_tor_not_connected_label": "OnionShare is not connected to the Tor network"
 }