From 400369e8c5cb5dfb9f78fe7e4092eeea87657cbf Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 23 Mar 2023 00:26:51 +0100 Subject: [PATCH] Testing tunneling: Wording in connection toast (#178088) --- .../remoteTunnel/node/remoteTunnelService.ts | 2 +- .../electron-sandbox/remoteTunnel.contribution.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts b/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts index 7e76730577df3..db8aa9eb54668 100644 --- a/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts +++ b/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts @@ -174,7 +174,7 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ const hostName = this._getHostName(); if (hostName) { - this.setTunnelStatus(TunnelStates.connecting(localize({ key: 'remoteTunnelService.openTunnelWithName', comment: ['{0} is a host name'] }, 'Opening tunnel for {0}', hostName))); + this.setTunnelStatus(TunnelStates.connecting(localize({ key: 'remoteTunnelService.openTunnelWithName', comment: ['{0} is a tunnel name'] }, 'Opening tunnel {0}', hostName))); } else { this.setTunnelStatus(TunnelStates.connecting(localize('remoteTunnelService.openTunnel', 'Opening tunnel'))); } diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts index 4e3339ea68c26..e4bd016e4af18 100644 --- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts +++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts @@ -80,7 +80,7 @@ namespace RemoteTunnelCommandLabels { export const showLog = localize('remoteTunnel.actions.showLog', 'Show Remote Tunnel Service Log'); export const configure = localize('remoteTunnel.actions.configure', 'Configure Machine Name...'); export const copyToClipboard = localize('remoteTunnel.actions.copyToClipboard', 'Copy Browser URI to Clipboard'); - export const learnMore = localize('remoteTunnel.actions.learnMore', 'Get Started with VS Code Tunnels'); + export const learnMore = localize('remoteTunnel.actions.learnMore', 'Get Started with Tunnels'); } @@ -215,9 +215,9 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo localize( { key: 'recommend.remoteExtension', - comment: ['{0} will be a host name, {1} will the link address to the web UI, {6} an extension name. [label](command:commandId) is a markdown link. Only translate the label, do not modify the format'] + comment: ['{0} will be a tunnel name, {1} will the link address to the web UI, {6} an extension name. [label](command:commandId) is a markdown link. Only translate the label, do not modify the format'] }, - "'{0}' has turned on remote access. The {1} extension can be used to connect to it.", + "Tunnel '{0}' is avaiable for remote access. The {1} extension can be used to connect to it.", usedOnHost, remoteExtension.friendlyName ), actions: { @@ -529,10 +529,10 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo localize( { key: 'progress.turnOn.final', - comment: ['{0} will be a host name, {1} will the link address to the web UI, {6} an extesnion name. [label](command:commandId) is a markdown link. Only translate the label, do not modify the format'] + comment: ['{0} will be the tunnel name, {1} will the link address to the web UI, {6} an extension name, {7} a link to the extension documentation. [label](command:commandId) is a markdown link. Only translate the label, do not modify the format'] }, - "Remote tunnel access is enabled for [{0}](command:{4}). To access from a different machine, open [{1}]({2}) or use the {6} extension. Use the Account menu to [configure](command:{3}) or [turn off](command:{5}).", - connectionInfo.hostName, connectionInfo.domain, linkToOpenForMarkdown, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName + "You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the VS Code Accounts menu.", + connectionInfo.hostName, connectionInfo.domain, linkToOpenForMarkdown, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName, 'https://code.visualstudio.com/docs/remote/tunnels' ), actions: { primary: [ @@ -729,7 +729,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo items.push({ id: RemoteTunnelCommandIds.learnMore, label: RemoteTunnelCommandLabels.learnMore }); if (this.connectionInfo && account) { quickPick.title = localize( - { key: 'manage.title.on', comment: ['{0} will be a user account name, {1} the provider name (e.g. Github), {2} is the host name'] }, + { key: 'manage.title.on', comment: ['{0} will be a user account name, {1} the provider name (e.g. Github), {2} is the tunnel name'] }, 'Remote Machine Access enabled for {0}({1}) as {2}', account.label, account.description, this.connectionInfo.hostName); items.push({ id: RemoteTunnelCommandIds.copyToClipboard, label: RemoteTunnelCommandLabels.copyToClipboard, description: this.connectionInfo.domain }); } else {