From 3e6672aaf17aa7f2517d03a806c3361e1cc1c0cf Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:37:51 -0400 Subject: [PATCH 1/5] change language --- resources/original_messages.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/original_messages.json b/resources/original_messages.json index e3a36dfaa8..416989281c 100644 --- a/resources/original_messages.json +++ b/resources/original_messages.json @@ -81,15 +81,15 @@ }, "error_connection_configuration": { "desciption": "An error message shown when the user's server configuration is invalid. The user should contact their service manager to resolve the issue.", - "message": "The configuration information for your server is incomplete or invalid. Please contact your service manager to troubleshoot this issue." + "message": "The configuration information for your server is incomplete or invalid. Please contact the person who gave you this access key to troubleshoot this issue." }, "error_connection_configuration_fetch": { "description": "An error message shown when the dynamic access key given proves to be unreachable. The user should contact their service manager to resolve the issue.", - "message": "Outline failed to download the configuration information for your server. Please contact your service manager to troubleshoot this issue." + "message": "Outline failed to download the configuration information for your server. Please contact the person who gave you this access key to troubleshoot this issue." }, "error_connection_proxy": { "description": "An error message show when Outline fails to establish contact with the obfuscation proxy.", - "message": "Outline could not connect to the server. Review the error details to troubleshoot your connection." + "message": "Outline could not connect to the server. Please check your internet connectivity, and then contact the person who gave you this access key to troubleshoot the issue." }, "error_details": { "description": "Button pointing to additional details of an error shown to the user", @@ -118,7 +118,7 @@ "message": "Sorry, this access key is not compatible with this version of Outline." }, "error_shadowsocks_unsupported_cipher": { - "description": "The server you requested to add uses an unsafe cipher ($CIPHER$). Please contact your server admin.", + "description": "The server you requested to add uses an unsafe cipher ($CIPHER$). Please contact the person who gave you this access key.", "message": "Shadowsocks Unsupported cipher", "placeholders": { "CIPHER": { @@ -233,7 +233,7 @@ }, "outline_plugin_error_invalid_server_credentials": { "description": "An error message when the user is trying to connect but has provided an invalid connection key.", - "message": "It seems like your access key is not valid. If this happens again, please contact your server admin." + "message": "It seems like your access key is not valid. If this happens again, please contact the person who gave you this access key." }, "outline_plugin_error_routing_tables": { "description": "An error message when the application is not able to configure the system for proxying. A button is shown alongside this message to submit feedback.", @@ -249,7 +249,7 @@ }, "outline_plugin_error_udp_forwarding_not_enabled": { "description": "An error message shown when the application tries to connect to a server that does not have the correct UDP forwarding configuration.", - "message": "It seems like this server doesn’t support UDP forwarding. If this happens again, please contact your server admin." + "message": "It seems like this server doesn’t support UDP forwarding. If this happens again, please contact the person who gave you this access key." }, "outline_plugin_error_unsupported_routing_table": { "description": "An error message when the application fails to connect due to another active VPN.", From 362285e60e8494afdf1c7707833cd5ce7c5d30dd Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:52:59 -0400 Subject: [PATCH 2/5] update en.json --- resources/original_messages.json | 2 +- src/www/messages/en.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/original_messages.json b/resources/original_messages.json index 416989281c..eb0f913d0f 100644 --- a/resources/original_messages.json +++ b/resources/original_messages.json @@ -249,7 +249,7 @@ }, "outline_plugin_error_udp_forwarding_not_enabled": { "description": "An error message shown when the application tries to connect to a server that does not have the correct UDP forwarding configuration.", - "message": "It seems like this server doesn’t support UDP forwarding. If this happens again, please contact the person who gave you this access key." + "message": "It seems like this server doesn’t support UDP forwarding. If this happens again, please contact the person who gave you access." }, "outline_plugin_error_unsupported_routing_table": { "description": "An error message when the application fails to connect due to another active VPN.", diff --git a/src/www/messages/en.json b/src/www/messages/en.json index 5b542da84f..5ce01c7afb 100644 --- a/src/www/messages/en.json +++ b/src/www/messages/en.json @@ -14,9 +14,9 @@ "disconnected-server-state": "Disconnected", "disconnecting-server-state": "Disconnecting...", "email-feedback-input": "Email address (optional)", - "error-connection-configuration": "The configuration information for your server is incomplete or invalid. Please contact your service manager to troubleshoot this issue.", - "error-connection-configuration-fetch": "Outline failed to download the configuration information for your server. Please contact your service manager to troubleshoot this issue.", - "error-connection-proxy": "Outline could not connect to the server. Review the error details to troubleshoot your connection.", + "error-connection-configuration": "The configuration information for your server is incomplete or invalid. Please contact the person who gave you this access key to troubleshoot this issue.", + "error-connection-configuration-fetch": "Outline failed to download the configuration information for your server. Please contact the person who gave you this access key to troubleshoot this issue.", + "error-connection-proxy": "Outline could not connect to the server. Please check your internet connectivity, and then contact the person who gave you this access key to troubleshoot the issue.", "error-details": "Details", "error-feedback-submission": "Sorry, we were unable to submit your feedback. Please check that you are connected to the internet and try again.", "error-invalid-access-key": "Invalid access key. Please try again, or submit feedback for help.", @@ -24,7 +24,7 @@ "error-server-incompatible": "Sorry, this access key is not compatible with this version of Outline.", "error-timeout": "Something seems to be taking longer than expected. Quitting and restarting may help. If this happens again, please submit feedback.", "error-unexpected": "Sorry, an unexpected error occurred. Quitting and restarting may help. If this happens again, please submit feedback.", - "error-shadowsocks-unsupported-cipher": "The server you requested to add uses an unsafe cipher ({cipher}). Please contact your server admin.", + "error-shadowsocks-unsupported-cipher": "The server you requested to add uses an unsafe cipher ($CIPHER$). Please contact the person who gave you this access key.", "feedback-cannot-add-server": "Can't add a server", "feedback-connection": "Can't connect to my server", "feedback-general": "General feedback", @@ -48,11 +48,11 @@ "tray-open-window": "Open", "outline-plugin-error-admin-permissions": "Outline needs admin permissions in order to be initialized. If you don't have admin permissions, please try again after restarting your computer or ask your system administrator for help.", "outline-plugin-error-antivirus": "It seems like your antivirus software is preventing us from successfully connecting.", - "outline-plugin-error-invalid-server-credentials": "It seems like your access key is not valid. If this happens again, please contact your server admin.", + "outline-plugin-error-invalid-server-credentials": "It seems like your access key is not valid. If this happens again, please contact the person who gave it to you.", "outline-plugin-error-routing-tables": "We were not able to configure your routing tables successfully. If this happens again, please reach out to us.", "outline-plugin-error-server-unreachable": "We can’t seem to connect to your server. Please check that you are connected to the internet and try again.", "outline-plugin-error-system-configuration": "Sorry, it looks like Outline is not properly installed. Please try installing it again. If that doesn’t work, please submit feedback through the app.", - "outline-plugin-error-udp-forwarding-not-enabled": "It seems like this server doesn’t support UDP forwarding. If this happens again, please contact your server admin.", + "outline-plugin-error-udp-forwarding-not-enabled": "It seems like this server doesn’t support UDP forwarding. If this happens again, please contact the person who gave you access.", "outline-plugin-error-unsupported-routing-table": "It seems like another VPN is active. Please disconnect it and try again.", "outline-plugin-error-vpn-permission-not-granted": "Outline needs your permission to set up a VPN connection to the server. Please try again, or submit feedback if you need help.", "outline-services-installation-confirmation": "We will initialize Outline, which may require admin permissions. Would you like to proceed?", From 57fc1b49e56f3573fb2a452b4a3ff06913cd841a Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:56:41 -0400 Subject: [PATCH 3/5] fix discrepancy --- resources/original_messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/original_messages.json b/resources/original_messages.json index eb0f913d0f..3f7c7f1f41 100644 --- a/resources/original_messages.json +++ b/resources/original_messages.json @@ -233,7 +233,7 @@ }, "outline_plugin_error_invalid_server_credentials": { "description": "An error message when the user is trying to connect but has provided an invalid connection key.", - "message": "It seems like your access key is not valid. If this happens again, please contact the person who gave you this access key." + "message": "It seems like your access key is not valid. If this happens again, please contact the person who gave it to you." }, "outline_plugin_error_routing_tables": { "description": "An error message when the application is not able to configure the system for proxying. A button is shown alongside this message to submit feedback.", From 57ff0f35aca2c4920b3647c827e7828eac5cdd51 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Tue, 25 Jul 2023 12:12:19 -0400 Subject: [PATCH 4/5] wip --- resources/original_messages.json | 2 +- src/www/messages/en.json | 4 ++-- src/www/views/servers_view/index.ts | 12 ++++-------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/resources/original_messages.json b/resources/original_messages.json index 3f7c7f1f41..6b3d095520 100644 --- a/resources/original_messages.json +++ b/resources/original_messages.json @@ -386,7 +386,7 @@ }, "server_create_your_own_zero_state": { "description": "When the user has not yet added a server to the application, the main page shows this message at the bottom.", - "message": "Don’t have a server?$NEW_LINE$Create your own at $START_OF_LINK$our website$END_OF_LINK$.", + "message": "Don’t have a server?$NEW_LINE$Create your own with the $START_OF_LINK$Outline Manager$END_OF_LINK$.", "placeholders": { "END_OF_LINK": { "content": "{closeLink}" diff --git a/src/www/messages/en.json b/src/www/messages/en.json index 5ce01c7afb..7d7cf6fa81 100644 --- a/src/www/messages/en.json +++ b/src/www/messages/en.json @@ -77,8 +77,8 @@ "server-connected": "Connected to “{serverName}”", "server-create-your-own": "Don’t have an access key?
Create your own at {openLink}our website{closeLink}.", "server-create-your-own-access": "Don’t have an access key?
Create your own at {openLink}our website{closeLink} or
request an {openLink2}access key{closeLink}.", - "server-create-your-own-zero-state": "Don’t have a server?
Create your own at {openLink}our website{closeLink}.", - "server-create-your-own-zero-state-access": "Don’t have a server?
Create your own at {openLink}our website{closeLink} or
request an {openLink2}access key{closeLink}.", + "server-create-your-own-zero-state": "Don’t have a server?
Create your own with the {openLink}Outline Manager{closeLink}.", + "server-create-your-own-zero-state-access": "Don’t have a server?
Create your own with the {openLink}Outline Manager{closeLink} or
request an {openLink2}access key{closeLink}.", "server-default-name": "Proxy Server", "server-default-name-outline": "Outline Server", "server-detected": "Please confirm that you want to add this server.", diff --git a/src/www/views/servers_view/index.ts b/src/www/views/servers_view/index.ts index 598621d972..68d4d7830c 100644 --- a/src/www/views/servers_view/index.ts +++ b/src/www/views/servers_view/index.ts @@ -105,14 +105,14 @@ Polymer({ @@ -125,11 +125,7 @@ Polymer({ fire-event-on-hide="AutoConnectDialogDismissed" > `, From adb9686224509840bfc0153e3c93da0f025bd320 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:53:48 +0000 Subject: [PATCH 5/5] add screenshot instruction --- resources/original_messages.json | 6 +++--- src/www/messages/en.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/original_messages.json b/resources/original_messages.json index 6b3d095520..9bb2656801 100644 --- a/resources/original_messages.json +++ b/resources/original_messages.json @@ -81,15 +81,15 @@ }, "error_connection_configuration": { "desciption": "An error message shown when the user's server configuration is invalid. The user should contact their service manager to resolve the issue.", - "message": "The configuration information for your server is incomplete or invalid. Please contact the person who gave you this access key to troubleshoot this issue." + "message": "Invalid configuration. Screenshot the error details and send them to your access key provider." }, "error_connection_configuration_fetch": { "description": "An error message shown when the dynamic access key given proves to be unreachable. The user should contact their service manager to resolve the issue.", - "message": "Outline failed to download the configuration information for your server. Please contact the person who gave you this access key to troubleshoot this issue." + "message": "Failed to download the server configuration. Screenshot the error details and send them to your access key provider." }, "error_connection_proxy": { "description": "An error message show when Outline fails to establish contact with the obfuscation proxy.", - "message": "Outline could not connect to the server. Please check your internet connectivity, and then contact the person who gave you this access key to troubleshoot the issue." + "message": "Failed to connect. Please check your internet connectivity, then screenshot the error details and send them to your access key provider." }, "error_details": { "description": "Button pointing to additional details of an error shown to the user", diff --git a/src/www/messages/en.json b/src/www/messages/en.json index 7d7cf6fa81..0c07385263 100644 --- a/src/www/messages/en.json +++ b/src/www/messages/en.json @@ -14,9 +14,9 @@ "disconnected-server-state": "Disconnected", "disconnecting-server-state": "Disconnecting...", "email-feedback-input": "Email address (optional)", - "error-connection-configuration": "The configuration information for your server is incomplete or invalid. Please contact the person who gave you this access key to troubleshoot this issue.", - "error-connection-configuration-fetch": "Outline failed to download the configuration information for your server. Please contact the person who gave you this access key to troubleshoot this issue.", - "error-connection-proxy": "Outline could not connect to the server. Please check your internet connectivity, and then contact the person who gave you this access key to troubleshoot the issue.", + "error-connection-configuration": "Invalid server configuration. Screenshot the error details and send them to your access key provider.", + "error-connection-configuration-fetch": "Failed to download the server configuration. Screenshot the error details and send them to your access key provider.", + "error-connection-proxy": "Failed to connect. Please check your internet connectivity, then screenshot the error details and send them to your access key provider.", "error-details": "Details", "error-feedback-submission": "Sorry, we were unable to submit your feedback. Please check that you are connected to the internet and try again.", "error-invalid-access-key": "Invalid access key. Please try again, or submit feedback for help.",