Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into sbruens/tun2socks-v…
Browse files Browse the repository at this point in the history 
…3.3.0
  • Loading branch information
@sbruens
sbruens committed Jul 27, 2023
2 parents 76f053c + 562f78d commit f518658
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 23 deletions.
14 changes: 7 additions & 7 deletions resources/original_messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "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 your service manager 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. Review the error details to troubleshoot your connection."
"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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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 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.",
Expand All @@ -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 access."
},
"outline_plugin_error_unsupported_routing_table": {
"description": "An error message when the application fails to connect due to another active VPN.",
Expand Down Expand Up @@ -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}"
Expand Down
16 changes: 8 additions & 8 deletions src/www/messages/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"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": "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.",
"error-server-already-added": "Server “{serverName}” already added.",
"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",
Expand All @@ -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?",
Expand All @@ -77,8 +77,8 @@
"server-connected": "Connected to “{serverName}”",
"server-create-your-own": "Don’t have an access key?<br>Create your own at {openLink}our website{closeLink}.",
"server-create-your-own-access": "Don’t have an access key?<br>Create your own at {openLink}our website{closeLink} or<br>request an {openLink2}access key{closeLink}.",
"server-create-your-own-zero-state": "Don’t have a server?<br>Create your own at {openLink}our website{closeLink}.",
"server-create-your-own-zero-state-access": "Don’t have a server?<br>Create your own at {openLink}our website{closeLink} or<br>request an {openLink2}access key{closeLink}.",
"server-create-your-own-zero-state": "Don’t have a server?<br>Create your own with the {openLink}Outline Manager{closeLink}.",
"server-create-your-own-zero-state-access": "Don’t have a server?<br>Create your own with the {openLink}Outline Manager{closeLink} or<br>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.",
Expand Down
12 changes: 4 additions & 8 deletions src/www/views/servers_view/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ Polymer({
</div>
<template is="dom-if" if="[[!useAltAccessMessage]]">
<div
class="footer subtle"
inner-h-t-m-l="[[localize('server-create-your-own-zero-state', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'closeLink', '</a>')]]"
class="footer subtle"
inner-h-t-m-l="[[localize('server-create-your-own-zero-state', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/get-started/index.html#step-1>', 'closeLink', '</a>')]]"
></div>
</template>
<template is="dom-if" if="[[useAltAccessMessage]]">
<div
class="footer subtle"
inner-h-t-m-l="[[localize('server-create-your-own-zero-state-access', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/index.html>', 'openLink2', '<a href=https://www.reddit.com/r/outlinevpn/wiki/index/outline_vpn_access_keys/>', 'closeLink', '</a>')]]"
inner-h-t-m-l="[[localize('server-create-your-own-zero-state-access', 'breakLine', '<br/>', 'openLink', '<a href=https://s3.amazonaws.com/outline-vpn/get-started/index.html#step-1>', 'openLink2', '<a href=https://www.reddit.com/r/outlinevpn/wiki/index/outline_vpn_access_keys/>', 'closeLink', '</a>')]]"
></div>
</template>
</div>
Expand All @@ -125,11 +125,7 @@ Polymer({
fire-event-on-hide="AutoConnectDialogDismissed"
></user-comms-dialog>
<template is="dom-if" if="[[!shouldShowZeroState]]">
<server-list
id="serverList"
servers="[[servers]]"
localize="[[localize]]"
></server-list>
<server-list id="serverList" servers="[[servers]]" localize="[[localize]]"></server-list>
</template>
</div>
`,
Expand Down

0 comments on commit f518658

Please sign in to comment.