diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-10-30 13:00:58 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-10-30 13:00:58 +0100 |
| commit | e28a10a2f9fe40632ac58cd9211e5f3009f2cc7a (patch) | |
| tree | 5c80f7be6e5890ed9295ab2bdf81965613164d98 | |
| parent | dcfc8d636a8352f576581bd26a2defc50f3c80ca (diff) | |
| parent | 71433a82b3e74ab6d1cb82d739b2718a57bd33d1 (diff) | |
| download | mullvadvpn-e28a10a2f9fe40632ac58cd9211e5f3009f2cc7a.tar.xz mullvadvpn-e28a10a2f9fe40632ac58cd9211e5f3009f2cc7a.zip | |
Merge branch 'improve-gui-help-texts'
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/Preferences.js | 10 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/Support.js | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gui/packages/desktop/src/renderer/components/Preferences.js b/gui/packages/desktop/src/renderer/components/Preferences.js index b9f923c7e1..9409432563 100644 --- a/gui/packages/desktop/src/renderer/components/Preferences.js +++ b/gui/packages/desktop/src/renderer/components/Preferences.js @@ -52,13 +52,17 @@ export default class Preferences extends Component<PreferencesProps, State> { <Cell.Label>Auto-connect</Cell.Label> <Switch isOn={this.props.autoConnect} onChange={this.props.setAutoConnect} /> </Cell.Container> - <Cell.Footer>Automatically connect the VPN when the computer starts.</Cell.Footer> + <Cell.Footer> + Automatically connect to the VPN at the earliest moment during computer boot-up. + </Cell.Footer> <Cell.Container> - <Cell.Label>Auto-start</Cell.Label> + <Cell.Label>Auto-launch</Cell.Label> <Switch isOn={this.state.autoStart} onChange={this._onChangeAutoStart} /> </Cell.Container> - <Cell.Footer>Automatically open Mullvad VPN at login to the system.</Cell.Footer> + <Cell.Footer> + Automatically launch the app when logging in to the computer. + </Cell.Footer> <Cell.Container> <Cell.Label>Local network sharing</Cell.Label> diff --git a/gui/packages/desktop/src/renderer/components/Support.js b/gui/packages/desktop/src/renderer/components/Support.js index bf9ddac8f0..9a61fb0a1c 100644 --- a/gui/packages/desktop/src/renderer/components/Support.js +++ b/gui/packages/desktop/src/renderer/components/Support.js @@ -309,6 +309,11 @@ export default class Support extends Component<SupportProps, SupportState> { </View> <Text style={styles.support__status_security__secure}>{'SECURE CONNECTION'}</Text> <Text style={styles.support__send_status}>{'Failed to send'}</Text> + <Text style={styles.support__sent_message}> + { + "You may need to go back to the app's main screen and click Disconnect before trying again. Don't worry, the information you entered will remain in the form." + } + </Text> </View> </View> <View style={styles.support__footer}> |