diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-04-19 11:32:33 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-04-19 11:32:33 +0200 |
| commit | 585303d6cb04657d7466a4ba5e1bc6c6eb0227d0 (patch) | |
| tree | 1286bb8e2e0ed784dc19a15d1651240e6f94de68 | |
| parent | 6352d8b0c99b084174d81980dac8b0b9a98f16ac (diff) | |
| parent | 1de7cace9ef4f0ffec67c9b2011f19321b3bb33b (diff) | |
| download | mullvadvpn-585303d6cb04657d7466a4ba5e1bc6c6eb0227d0.tar.xz mullvadvpn-585303d6cb04657d7466a4ba5e1bc6c6eb0227d0.zip | |
Merge branch 'change-custom-dns-placeholder'
| -rw-r--r-- | gui/locales/messages.pot | 11 | ||||
| -rw-r--r-- | gui/src/renderer/components/AdvancedSettings.tsx | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 4d50f5d411..9a4376936e 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -220,10 +220,6 @@ msgid "Default" msgstr "" msgctxt "advanced-settings-view" -msgid "e.g. 10.0.0.4" -msgstr "" - -msgctxt "advanced-settings-view" msgid "Enable anyway" msgstr "" @@ -240,6 +236,10 @@ msgid "Enable to add at least one DNS server." msgstr "" msgctxt "advanced-settings-view" +msgid "Enter IP" +msgstr "" + +msgctxt "advanced-settings-view" msgid "If you disconnect or quit the app, this setting will block your internet." msgstr "" @@ -1222,6 +1222,9 @@ msgstr "" msgid "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." msgstr "" +msgid "e.g. 10.0.0.4" +msgstr "" + msgid "Account credit expires in a day" msgid_plural "Account credit expires in %d days" msgstr[0] "" diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx index 42c1f38d66..a81981263a 100644 --- a/gui/src/renderer/components/AdvancedSettings.tsx +++ b/gui/src/renderer/components/AdvancedSettings.tsx @@ -470,7 +470,7 @@ export default class AdvancedSettings extends React.Component<IProps, IState> { {this.state.showAddCustomDns && ( <div ref={this.customDnsInputContainerRef}> <Cell.RowInput - placeholder={messages.pgettext('advanced-settings-view', 'e.g. 10.0.0.4')} + placeholder={messages.pgettext('advanced-settings-view', 'Enter IP')} onSubmit={this.addDnsAddress} onChange={this.addDnsInputChange} invalid={this.state.invalidDnsIp} |