diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-06-10 10:51:58 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-06-10 10:51:58 +0100 |
| commit | ebbdcb4baf42b58909e95b118cf27e8ca01a8982 (patch) | |
| tree | 0f5b2703d9212d00ced62bee2b18692f29fcbc6f /gui | |
| parent | 7aee7111bd914eb64bb7cff86758dcf7b41dc08f (diff) | |
| parent | 77259ca8c8025b7eb73a310ed42e2c3e0c2ab094 (diff) | |
| download | mullvadvpn-ebbdcb4baf42b58909e95b118cf27e8ca01a8982.tar.xz mullvadvpn-ebbdcb4baf42b58909e95b118cf27e8ca01a8982.zip | |
Merge branch 'gui-fix-bridge-naming'
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/renderer/components/AdvancedSettings.tsx | 2 | ||||
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx index 5a4b7b0d5a..e6c750175c 100644 --- a/gui/src/renderer/components/AdvancedSettings.tsx +++ b/gui/src/renderer/components/AdvancedSettings.tsx @@ -205,7 +205,7 @@ export default class AdvancedSettings extends Component<IProps, IState> { <Selector title={ // TRANSLATORS: The title for the shadowsocks bridge selector section. - messages.pgettext('advanced-settings-view', 'Shadowsocks bridge') + messages.pgettext('advanced-settings-view', 'Bridge mode') } values={this.bridgeStateItems} value={this.props.bridgeState} diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index 891c06c8b9..32cd6c4d0f 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -52,7 +52,7 @@ export function proxyTypeToString(proxy: ProxyType): string { case 'shadowsocks': return 'Shadowsocks'; case 'custom': - return 'Custom'; + return 'custom bridge'; default: return ''; } |
