From ad0c12ec9513977395af7da6d7d9e8e9051557d5 Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Wed, 20 Dec 2017 10:25:10 -0800
Subject: [PATCH] Change 'Server name' to 'Server' (#372)

---
 extensions/mssql/client/src/config.json             | 4 ++--
 src/sql/parts/connection/common/connectionStatus.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/mssql/client/src/config.json b/extensions/mssql/client/src/config.json
index 96a7e8038a..6e685eb1c1 100644
--- a/extensions/mssql/client/src/config.json
+++ b/extensions/mssql/client/src/config.json
@@ -28,7 +28,7 @@
 							"specialValueType": "serverName",
 							"isIdentity": true,
 							"name": "server",
-							"displayName": "Server name",
+							"displayName": "Server",
 							"description": "Name of the SQL Server instance",
 							"groupName": "Source",
 							"valueType": "string",
@@ -42,7 +42,7 @@
 							"specialValueType": "databaseName",
 							"isIdentity": true,
 							"name": "database",
-							"displayName": "Database name",
+							"displayName": "Database",
 							"description": "The name of the initial catalog or database int the data source",
 							"groupName": "Source",
 							"valueType": "string",
diff --git a/src/sql/parts/connection/common/connectionStatus.ts b/src/sql/parts/connection/common/connectionStatus.ts
index b12c417ab8..f2a39d82ee 100644
--- a/src/sql/parts/connection/common/connectionStatus.ts
+++ b/src/sql/parts/connection/common/connectionStatus.ts
@@ -147,11 +147,11 @@ export class ConnectionStatusbarItem implements IStatusbarItem {
 		}
 
 		let tooltip: string =
-			'Server name: ' + connectionProfile.serverName + '\r\n' +
-			'Database name: ' + (connectionProfile.databaseName ? connectionProfile.databaseName : '<default>') + '\r\n';
+			'Server: ' + connectionProfile.serverName + '\r\n' +
+			'Database: ' + (connectionProfile.databaseName ? connectionProfile.databaseName : '<default>') + '\r\n';
 
 		if (connectionProfile.userName && connectionProfile.userName !== '') {
-			tooltip = tooltip + 'Login name: ' + connectionProfile.userName + '\r\n';
+			tooltip = tooltip + 'Login: ' + connectionProfile.userName + '\r\n';
 		}
 
 		this._connectionElement.textContent = text;