Feature/ui string review (#176)

* UI strings fit and finish (pre-signoff) * Fixed UI string for Cancel Executing Query command * Updated cancel query UI strings * Authentication type name modification from SQL Authentication to SQL Login * string change for database promot CR profile * string review update * Save file UI string update * Fix typo
2016-10-19 10:25:30 -07:00 · 2016-10-19 10:25:30 -07:00 · 8c1c010f11
--- a/package.json
+++ b/package.json
@ -117,37 +117,37 @@
      {
        "command": "extension.runQuery",
        "title": "Execute Query",
-        "category": "SQL"
+        "category": "MS SQL"
      },
      {
        "command": "extension.cancelQuery",
-        "title": "Cancel executing T-SQL query",
-        "category": "SQL"
+        "title": "Cancel Query",
+        "category": "MS SQL"
      },
      {
        "command": "extension.connect",
        "title": "Connect",
-        "category": "SQL"
+        "category": "MS SQL"
      },
      {
        "command": "extension.disconnect",
        "title": "Disconnect",
-        "category": "SQL"
+        "category": "MS SQL"
      },
      {
        "command": "extension.manageProfiles",
        "title": "Manage Connection Profiles",
-        "category": "SQL"
+        "category": "MS SQL"
      },
      {
        "command": "extension.chooseDatabase",
        "title": "Use Database",
-        "category": "SQL"
+        "category": "MS SQL"
      },
      {
        "command": "extension.showReleaseNotes",
        "title": "Getting Started Guide",
-        "category": "SQL"
+        "category": "MS SQL"
      }
    ],
    "keybindings": [
@ -200,29 +200,29 @@
              "password": "{{put-password-here}}"
            }
          ],
-          "description": "Connections placed here are shown in the connections picklist across VS Code sessions.",
+          "description": "Connection profiles defined in 'User Settings' are shown under 'MS SQL: Connect' command in the command palette.",
          "items": {
            "type": "object",
            "properties": {
              "server": {
                "type": "string",
                "default": "{{put-server-name-here}}",
-                "description": "[Required] Server to connect to. Use 'hostname\\instance' or '<server>.database.windows.net'."
+                "description": "[Required] Server name to connect to. Use 'hostname\\instance' or '<server>.database.windows.net' for Azure SQL Database."
              },
              "database": {
                "type": "string",
                "default": "{{put-database-name-here}}",
-                "description": "[Optional] Database to connect to. If this is empty, default depends on server configuration, typically 'master'."
+                "description": "[Optional] Database name to connect to. If database is not specified, the default user database setting is used, typically 'master'."
              },
              "user": {
                "type": "string",
                "default": "{{put-username-here}}",
-                "description": "[Optional] User name for SQL authentication. If this is empty, you are prompted when you connect."
+                "description": "[Optional] User name for SQL authentication. If user name is not specified, mssql extension will ask it when you connect."
              },
              "password": {
                "type": "string",
                "default": "{{put-password-here}}",
-                "description": "[Optional] Password for SQL authentication. If this is empty, you are prompted when you connect."
+                "description": "[Optional] Password for SQL authentication. If password is not specified or already saved, mssql extension will ask it when you connect."
              },
              "authenticationType": {
                "type": "string",
@ -231,7 +231,7 @@
                  "Integrated",
                  "SqlLogin"
                ],
-                "description": "[Optional] Specifies the method of authenticating with SQL Server."
+                "description": "[Optional] Specify the method of authenticating with SQL Server."
              },
              "port": {
                "type": "number",
@ -241,21 +241,22 @@
              "encrypt": {
                "type": "boolean",
                "default": false,
-                "description": "[Optional] Specify if the connection will be encrypted. Always set to 'true' for Azure SQL DB and loaded from here otherwise."
+                "description": "[Optional] When true, SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. Set 'true' for Azure SQL Database connection."
              },
              "trustServerCertificate": {
                "type": "boolean",
-                "description": "[Optional]"
+                "default": false,
+                "description": "[Optional] When 'true', the SQL Server SSL certificate is automatically trusted when the communication layer is encrypted using SSL. Set 'false' for Azure SQL Database connection."
              },
              "persistSecurityInfo": {
                "type": "boolean",
                "default": false,
-                "description": "[Optional]"
+                "description": "[Optional] When false, security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has evever been in an open state."
              },
              "connectTimeout": {
                "type": "number",
                "default": 15,
-                "description": "[Optional] The length of time in seconds to wait for a connection to the server before terminating the attempt and generating error."
+                "description": "[Optional] The length of time in seconds to wait for a connection to the server before terminating the attempt and generating error. The default timeout value for Azure SQL Database is 30."
              },
              "connectRetryCount": {
                "type": "number",
@ -270,7 +271,7 @@
              "applicationName": {
                "type": "string",
                "default": "vscode-mssql",
-                "description": "[Optional] Application name used for SQL server logging (default: 'vscode-mssql')."
+                "description": "[Optional] The name of the application used for SQL Server to log (default: 'vscode-mssql')."
              },
              "workstationId": {
                "type": "string",
@ -284,77 +285,77 @@
                  "ReadWrite",
                  "ReadOnly"
                ],
-                "description": "[Optional]"
+                "description": "[Optional] Declares the application workload type when connecting to SQL Server such as ReadWrite or ReadOnly. Refer to SQL Server AlwaysOn for more detail."
              },
              "currentLanguage": {
                "type": "string",
                "default": "",
-                "description": "[Optional]"
+                "description": "[Optional] The SQL Server language record name."
              },
              "pooling": {
                "type": "boolean",
                "default": false,
-                "description": "[Optional]"
+                "description": "[Optional] When true, the connection object is drawn from the appropriate pool, or if necessary, is created and added to the appropriate pool."
              },
              "maxPoolSize": {
                "type": "number",
                "default": 100,
-                "description": "[Optional]"
+                "description": "[Optional] The maximum number of connections allowed in the pool."
              },
              "minPoolSize": {
                "type": "number",
                "default": 0,
-                "description": "[Optional]"
+                "description": "[Optional] The minimum number of connections allowed in the pool."
              },
              "loadBalanceTimeout": {
                "type": "number",
                "default": 0,
-                "description": "[Optional]"
+                "description": "[Optional] The minimum amount of time in seconds for this connection to live in the pool before being destroyed."
              },
              "replication": {
                "type": "boolean",
                "default": true,
-                "description": "[Optional]"
+                "description": "[Optional] Used by SQL Server in replication."
              },
              "attachDbFilename": {
                "type": "string",
                "default": "",
-                "description": "[Optional]"
+                "description": "[Optional] The name of the primary file, including the full path name, of an attachable database."
              },
              "failoverPartner": {
                "type": "string",
                "default": "",
-                "description": "[Optional]"
+                "description": "[Optional] The name or network address of the instance of SQL Server that acts as a failover partner."
              },
              "multiSubnetFailover": {
                "type": "boolean",
                "default": true,
-                "description": "[Optional]"
+                "description": "[Optional] When true, the detection and connection to the active server is faster if AlwasyOn Availability Group is configured on different subnets."
              },
              "multipleActiveResultSets": {
                "type": "boolean",
                "default": false,
-                "description": "[Optional]"
+                "description": "[Optional] When true, multiple result sets can be returned and read from on connection."
              },
              "packetSize": {
                "type": "number",
                "default": 8192,
-                "description": "[Optional]"
+                "description": "[Optional] Size in bytes of the network packets to communicate with SQL Server."
              },
              "typeSystemVersion": {
                "type": "string",
                "enum": [
                  "Latest"
                ],
-                "description": "[Optional]"
+                "description": "[Optional] Indicates which server type the provider will expose through the DataReader."
              },
              "profileName": {
                "type": "string",
-                "description": "[Optional]"
+                "description": "[Optional] Specify a custom name for this connection profile to easily browse and search in the command palette of Visual Studio Code."
              },
              "savePassword": {
                "type": "boolean",
-                "description": "[Optional]"
+                "description": "[Optional] When true, the password for SQL Login Authentication is saved in the secure store of your operating system such as KeyChain in MacOS or Secure Store in Windows."
              }
            }
          }
--- a/src/models/constants.ts
+++ b/src/models/constants.ts
@ -64,9 +64,9 @@ export const msgRunQueryConnectionDisconnected = 'runQuery: active connection is
 export const msgRunQueryNoConnection = 'runQuery: no active connection - prompting for user';
 export const msgRunQueryInProgress = 'A query is already executing for this editor session. Please cancel this query or wait for its completion.';

-export const msgCancelQueryFailed = 'Failed to cancel query: {0}';
+export const msgCancelQueryFailed = 'Failed to cancel query execution: {0}';
 export const msgCancelQueryNotRunning = 'Cannot cancel query, no query is executing';
-export const msgCancelQuerySuccess = 'Query successfully canceled';
+export const msgCancelQuerySuccess = 'Successfully canceled query execution';

 export const msgContentProviderOnContentUpdated = 'Content provider: onContentUpdated called';
 export const msgContentProviderAssociationFailure = 'Content provider: Unable to associate status view for current file';
@ -96,8 +96,8 @@ export const msgOpenSqlFile = 'To use this command, Open a .sql file -or- ' +
                                'Change editor language to "SQL" -or- ' +
                                'Select some T-SQL text in the active SQL editor.';

-export const recentConnectionsPlaceholder = 'Choose a connection from the list below';
-export const msgNoConnectionsInSettings = 'To use this command, add connection information to VS Code User or Workspace settings.';
+export const recentConnectionsPlaceholder = 'Choose a connection profile from the list below';
+export const msgNoConnectionsInSettings = 'To use this command, add connection profile to User Settings.';
 export const labelOpenGlobalSettings = 'Open Global Settings';
 export const labelOpenWorkspaceSettings = 'Open Workspace Settings';
 export const CreateProfileFromConnectionsListLabel = 'Create Connection Profile';
@ -111,31 +111,31 @@ export const SampleServerName = '{{put-server-name-here}}';
 export const serverPrompt = 'Server name';
 export const serverPlaceholder = 'hostname\\instance or <server>.database.windows.net';
 export const databasePrompt = 'Database name';
-export const databasePlaceholder = 'optional database to connect to (default depends on server configuration, typically "master")';
+export const databasePlaceholder = '[Optional] Database to connect (press Enter to connect to <default> database)';
 export const databaseDefaultValue = 'master';
 export const authTypePrompt = 'Authentication Type';
 export const authTypeIntegrated = 'Integrated';
-export const authTypeSql = 'SQL Authentication';
+export const authTypeSql = 'SQL Login';
 export const authTypeAdUniversal = 'Active Directory Universal';
-export const usernamePrompt = 'Username';
-export const usernamePlaceholder = 'username (SQL Authentication)';
+export const usernamePrompt = 'User name';
+export const usernamePlaceholder = 'User name (SQL Login)';
 export const passwordPrompt = 'Password';
-export const passwordPlaceholder = 'Password (SQL Authentication)';
+export const passwordPlaceholder = 'Password (SQL Login)';
 export const msgSavePassword = 'Save Password? If \'No\', password will be required each time you connect';
 export const profileNamePrompt = 'Profile Name';
-export const profileNamePlaceholder = 'optional - enter a name for this profile';
+export const profileNamePlaceholder = '[Optional] Enter a name for this profile';

 export const filepathPrompt = 'File path';
-export const filepathPlaceholder = 'Enter full path or simply file name';
-export const filepathMessage = 'Enter full path or simply file name';
-export const overwritePrompt = 'The file already exists. Would you like to overwrite?';
+export const filepathPlaceholder = 'File name';
+export const filepathMessage = 'File name';
+export const overwritePrompt = 'The file already exists. Do you want to replace the existing file?';
 export const overwritePlaceholder = 'The file already exists';

 export const msgSelectProfile = 'Select Connection Profile';
 export const msgSelectProfileToRemove = 'Select profile to remove';

-export const confirmRemoveProfilePrompt = 'Are you sure you want to remove this profile?';
-export const msgNoProfilesSaved = 'No connection profiles are currently saved';
+export const confirmRemoveProfilePrompt = 'Confirm to remove this profile.';
+export const msgNoProfilesSaved = 'No connection profile to remove.';
 export const msgProfileRemoved = 'Profile removed successfully';
 export const msgProfileCreated = 'Profile created successfully';
 export const msgProfileCreatedAndConnected = 'Profile created and connected';
@ -163,7 +163,7 @@ export const executeQueryLabel = 'Executing query ';
 export const cancelingQueryLabel = 'Canceling query ';

 export const serviceCompatibleVersion = '1.0.0';
-export const serviceNotCompatibleError = 'Client is not compatiable with the service layer';
+export const serviceNotCompatibleError = 'Client is not compatible with the service layer';
 export const serviceInstalling = 'Installing Sql Tools Service';
 export const serviceInstalled = 'Sql Tools Service installed';
 export const serviceInstallationFailed = 'Failed to install Sql Tools Service';
@ -174,12 +174,12 @@ export const extensionNotInitializedError = 'Unable to execute the command while
 export const untitledScheme = 'untitled';
 export const untitledSaveTimeThreshold = 10.0;

-export const msgChangeLanguageMode = 'To use this command, you must set the language to \"SQL\". Change language mode?';
+export const msgChangeLanguageMode = 'To use this command, you must set the language to \"SQL\". Confirm to change language mode.';
 export const timeToWaitForLanguageModeChange = 10000.0;

 export const msgChangedDatabaseContext = 'Changed database context to \"{0}\" for document \"{1}\"';

-export const msgPromptRetryCreateProfile = 'Error: Unable to connect using the profile information provided. Retry profile creation?';
+export const msgPromptRetryCreateProfile = 'Error: Unable to connect using the connection information provided. Retry profile creation?';

 export const msgConnecting = 'Connecting to server \"{0}\" on document \"{1}\".';
 export const msgConnectedServerInfo = 'Connected to server \"{0}\" on document \"{1}\". Server information: {2}';
@ -188,7 +188,7 @@ export const msgChangingDatabase = 'Changing database context to \"{0}\" on serv
 export const msgChangedDatabase = 'Changed database context to \"{0}\" on server \"{1}\" on document \"{2}\".';
 export const msgDisconnected = 'Disconnected on document \"{0}\"';

-export const msgErrorReadingConfigFile = 'Error: Unable to load connection profiles from [{0}]. Check that the file is formatted correctly.';
+export const msgErrorReadingConfigFile = 'Error: Unable to load connection profiles from [{0}]. Check if the file is formatted correctly.';
 export const msgErrorOpeningConfigFile = 'Error: Unable to open connection profile settings file.';


@ -200,5 +200,5 @@ export const sqlToolsServiceDownloadUrlConfigKey = 'downloadUrl';

 export const titleResultsPane = 'Results: {0}';

-export const macOpenSslErrorMessage = `OpenSSL version >=1.0.1 is required for connecting.`;
+export const macOpenSslErrorMessage = `OpenSSL version >=1.0.1 is required to connect.`;