diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js index 71f35088ef..509da81d39 100644 --- a/build/gulpfile.extensions.js +++ b/build/gulpfile.extensions.js @@ -282,7 +282,7 @@ gulp.task(packageLocalizationExtensionsTask); const compileLocalizationExtensionsBuildTask = task.define('compile-localization-extensions-build', task.series( cleanExtensionsBuildTask, compileExtensionsTask, - task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))), + task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))), packageLocalizationExtensionsTask, )); diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index d5d2065caa..e65adb5d1a 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -579,12 +579,12 @@ const vscodeTranslationsExport = task.define( compileLocalizationExtensionsBuildTask, // {{SQL CARBON EDIT}} now include all extensions in ADS, not just a subset. (replaces 'compileExtensionsBuildTask' here). function () { const pathToMetadata = './out-vscode/nls.metadata.json'; - const pathToRehWebMetadata = './out-vscode-reh-web/nls.metadata.json'; + //const pathToRehWebMetadata = './out-vscode-reh-web/nls.metadata.json'; // Disabling as web build is no longer done. const pathToExtensions = '.build/extensions/*'; const pathToSetup = 'build/win32/i18n/messages.en.isl'; return es.merge( - gulp.src([pathToMetadata, pathToRehWebMetadata]).pipe(merge({ + gulp.src([pathToMetadata]).pipe(merge({ // [pathToMetadata, pathToRehWebMetadata] (use when web build is enabled). fileName: 'nls.metadata.json', jsonSpace: '', concatArrays: true diff --git a/resources/xlf/en/sql.xlf b/resources/xlf/en/sql.xlf index 855de82c8a..7849967c85 100644 --- a/resources/xlf/en/sql.xlf +++ b/resources/xlf/en/sql.xlf @@ -4181,10 +4181,7 @@ Error: {1} - (Preview) Filter Settings: {0} - - - Node Path: {0} + Filter Settings New Connection @@ -4203,6 +4200,9 @@ Error: {1} + + Object Explorer + Auto-expand Server Groups in the Object Explorer viewlet. @@ -4235,6 +4235,9 @@ Error: {1} Notebook + + Object Explorer + Profiler @@ -4634,6 +4637,9 @@ Error: {1} Whether to show the action bar in the query results view + + Whether to skip adding a line break between rows when copying results if the previous row already has a trailing line break. The default value is false. + Enable results streaming; contains few minor visual issues @@ -4926,13 +4932,13 @@ Error: {1} An error occurred refreshing node '{0}': {1} - An error occurred while executing the action: {0}. + An error occurred while executing the action '{0}': {1}. Close - Generating script... + Executing action: {0}... @@ -4954,9 +4960,6 @@ Error: {1} Tasks - - View - @@ -5030,6 +5033,15 @@ Error: {1} Refresh + + Whether the the tree view with id {0} enables collapse all. + + + Whether the tree view with id {0} enables refresh. + + + Whether collapse all is toggled for the tree view with id {0}. + @@ -5188,9 +5200,6 @@ Error: {1} User Welcome Tour - - Help - Hide Welcome Tour @@ -5352,6 +5361,17 @@ Error: {1} Open the welcome page with Getting Started Tour (default) This is the description for a setting. Values surrounded by single quotes are not to be translated. + + + + Help improve Azure Data Studio by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt in]({1}). + + + Help improve Azure Data Studio by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt out]({1}). + + + Read More + @@ -6278,12 +6298,6 @@ Error Message: {1} Are you sure you want to delete connection '{0}'? - - No - - - Yes - Delete Group @@ -6291,7 +6305,7 @@ Error Message: {1} Are you sure you want to delete connection group '{0}'? - Filter (Preview) + Filter Remove Filter @@ -6340,6 +6354,9 @@ Error Message: {1} Contains + + Ends With + Equals @@ -6352,12 +6369,6 @@ Error Message: {1} Greater Than - - Is Not Null - - - Is Null - Less Than Or Equals @@ -6365,7 +6376,7 @@ Error Message: {1} Less Than - Node Path: {0} + Path: Not Between @@ -6373,9 +6384,15 @@ Error Message: {1} Not Contains + + Not Ends With + Not Equals + + Not Starts With + OK @@ -6385,6 +6402,9 @@ Error Message: {1} Property + + Starts With + True @@ -7129,14 +7149,5 @@ Error Message: {1} Yes - - - - Getting &&Started - && denotes a mnemonic - - - Show Getting Started - \ No newline at end of file