diff --git a/resources/xlf/en/git.xlf b/resources/xlf/en/git.xlf index ccb37f61cb..3e59328302 100644 --- a/resources/xlf/en/git.xlf +++ b/resources/xlf/en/git.xlf @@ -1,5 +1,25 @@ + + + Publish Branch + + + Publishing Branch... + + + $(cloud-upload) Publish Branch + + + {0} Sync Changes {1}{2} + + + {0} {1}{2} + + + Synchronizing Changes... + + Missing or invalid credentials. @@ -65,7 +85,7 @@ Can't push refs to remote. Try running 'Pull' first to integrate your changes. - Log level changed to: {0} + {0} Log level changed to: {1} Checkout detached... @@ -143,7 +163,7 @@ Are you sure to continue? Are you sure to continue? - The branch '{0}' has no upstream branch. Would you like to publish this branch? + The branch '{0}' has no remote branch. Would you like to publish this branch? Are you sure you want to restore {0}? @@ -200,6 +220,12 @@ What would you like to do? Discard 1 File + + Are you sure you want to drop ALL stashes? There are {0} stashes that will be subject to pruning, and MAY BE IMPOSSIBLE TO RECOVER. + + + Are you sure you want to drop ALL stashes? There is 1 stash that will be subject to pruning, and MAY BE IMPOSSIBLE TO RECOVER. + Force Checkout @@ -212,11 +238,14 @@ What would you like to do? Git: {0} + + Open Comparison + - {0} ⟷ {1} + {0} ↔ {1} - {0} ({1}) ⟷ {0} ({2}) + {0} ({1}) ↔ {0} ({2}) {0} (Index) @@ -458,7 +487,7 @@ Would you like to stage all your changes and commit them directly? Are you sure you want to drop the stash: {0}? - This action will push and pull commits to and from '{0}/{1}'. + This action will pull and push commits from and to '{0}/{1}'. Tag at {0} @@ -518,13 +547,13 @@ These files will be FOREVER LOST. - Skipped found git in: {0} + {0} Skipped found git in: {1} - Using git {0} from {1} + {0} Using git {1} from {2} - Validating found git in: {0} + {0} Validating found git in: {1} @@ -537,38 +566,12 @@ These files will be FOREVER LOST. Choose a repository + + Unable to automatically open the git repository at '{0}'. To open that git repository, open it directly as a folder in VS Code. + The '{0}' repository has {1} submodules which won't be opened automatically. You can still open each one individually by opening a file within. - - - - Branch name - - - $(error) Error: {0} - - - No remote repositories found. - - - Choose a URL to clone from. - - - Provide repository URL - - - Provide repository URL or pick a repository source. - - - Repository name - - - Repository name (type to search) - - - URL - @@ -709,15 +712,6 @@ These files will be FOREVER LOST. Successfully pushed. - - $(cloud-upload) Publish Changes - - - Publish Changes - - - Sync Changes $(sync){0}{1} - Staged Changes @@ -744,8 +738,8 @@ These files will be FOREVER LOST. Checkout branch/tag... - - Publish Changes + + Publish Branch Publish to {0} @@ -761,14 +755,11 @@ These files will be FOREVER LOST. - - Index + + Email - - {0} — {1} -{2} - -{3} + + Open Comparison Git History @@ -782,9 +773,6 @@ These files will be FOREVER LOST. You - - Working Tree - @@ -820,6 +808,15 @@ These files will be FOREVER LOST. Add Remote... + + Get Remote Sources + + + Get Repositories + + + Get Repository State + Create Branch... @@ -856,6 +853,9 @@ These files will be FOREVER LOST. Close Repository + + Close All Diff Editors + Commit @@ -1001,7 +1001,7 @@ These files will be FOREVER LOST. Restore Commit Template - Reveal in Side Bar + Reveal in Explorer View Revert Change @@ -1048,6 +1048,9 @@ These files will be FOREVER LOST. Drop Stash... + + Drop All Stashes... + Stash (Include Untracked) @@ -1150,6 +1153,12 @@ These files will be FOREVER LOST. Tags + + Controls whether the diff editor should be automatically closed when changes are stashed, committed, discarded, staged, or unstaged. + + + List of git commands (ex: commit, push) that would have their `stdout` logged to the [git output](command:git.showOutput). If the git command has a client-side hook configured, the client-side hook's `stdout` will also be logged to the [git output](command:git.showOutput). + Always confirm the creation of empty commits for the 'Git: Commit Empty' command. @@ -1201,6 +1210,9 @@ These files will be FOREVER LOST. Whether git is enabled. + + Experimental improvements for the git setup flow. + When enabled, fetch all branches when pulling. Otherwise, fetch just the current one. @@ -1303,6 +1315,12 @@ These files will be FOREVER LOST. Force git to use rebase when running the sync command. + + List of folders that are ignored while scanning for Git repositories when `#git.autoRepositoryDetection#` is set to `true` or `subFolders`. + + + Controls the depth used when scanning workspace folders for Git repositories when `#git.autoRepositoryDetection#` is set to `true` or `subFolders`. Can be set to `-1` for no limit. + Controls whether to require explicit Git user configuration or allow Git to guess if missing. @@ -1366,6 +1384,9 @@ These files will be FOREVER LOST. Controls whether to show the commit author in the Timeline view. + + Controls whether to show uncommitted changes in the Timeline view. + Controls how untracked changes behave. @@ -1384,6 +1405,9 @@ These files will be FOREVER LOST. Controls whether force pushing uses the safer force-with-lease variant. + + Controls whether GIT_ASKPASS should be overwritten to use the integrated version. + Git SCM Integration @@ -1429,7 +1453,7 @@ These files will be FOREVER LOST. If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D). -To learn more about how to use git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm). +To learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm). In order to use git features, you can open a folder containing a git repository or clone from a URL. @@ -1451,6 +1475,22 @@ To learn more about how to use git and source control in Azure Data Studio [read A valid git installation was not detected, more details can be found in the [git output](command:git.showOutput). Please [install git](https://git-scm.com/), or learn more about how to use git and source control in Azure Data Studio in [our docs](https://aka.ms/vscode-scm). If you're using a different version control system, you can [search the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22) for additional extensions. + + + Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm). + + + Source control depends on Git being installed. +[Download Git for Linux](https://git-scm.com/download/linux) +After installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22). + + + [Download Git for macOS](https://git-scm.com/download/mac) +After installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22). + + + [Download Git for Windows](https://git-scm.com/download/win) +After installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22). The workspace currently open doesn't have any folders containing git repositories. You can initialize a repository on a folder which will enable source control features powered by git. diff --git a/resources/xlf/en/query-history.xlf b/resources/xlf/en/query-history.xlf index 339877b9c9..51dd937aab 100644 --- a/resources/xlf/en/query-history.xlf +++ b/resources/xlf/en/query-history.xlf @@ -4,6 +4,12 @@ Error loading saved query history items. {0} + + Failed + + + Succeeded + diff --git a/resources/xlf/en/sql-database-projects.xlf b/resources/xlf/en/sql-database-projects.xlf index a2c025ca9b..023a7c3b9e 100644 --- a/resources/xlf/en/sql-database-projects.xlf +++ b/resources/xlf/en/sql-database-projects.xlf @@ -492,12 +492,18 @@ hr + + Image tag + Import Elements Include + + Include permissions in project + Include permissions diff --git a/resources/xlf/en/sql-migration.xlf b/resources/xlf/en/sql-migration.xlf index 69053719c0..a5e792d6f8 100644 --- a/resources/xlf/en/sql-migration.xlf +++ b/resources/xlf/en/sql-migration.xlf @@ -405,9 +405,6 @@ This may take some time. An error occurred while accessing database details. - - Ensure that your backups were taken with the WITH CHECKSUM option. - An error occurred while connecting to target migration database. @@ -744,9 +741,6 @@ This may take some time. Last applied LSN - - Last backup - Last scan completed: {0} @@ -1272,6 +1266,9 @@ This may take some time. General purpose + + Hyperscale + {0} - {1} - {2} vCore @@ -1705,16 +1702,10 @@ This may take some time. Status: Succeeded - {0} Errors) - - - {0} + ({0} errors) - {0} Error) - - - {0} ( + ({0} error) Failed @@ -1722,9 +1713,15 @@ This may take some time. In progress + + Ready for cutover + Refresh + + Restoring + Retriable @@ -1737,11 +1734,20 @@ This may take some time. Succeeded + + Uploading full backup + + + Uploading log backup(s) + + + {0} + - {0} Warnings) + ({0} warnings) - {0} Warning) + ({0} warning) Storage account diff --git a/resources/xlf/en/sql.xlf b/resources/xlf/en/sql.xlf index f653f3c951..f531737248 100644 --- a/resources/xlf/en/sql.xlf +++ b/resources/xlf/en/sql.xlf @@ -142,6 +142,9 @@ In order to use Azure Data Studio in {0}, Azure Data Studio needs to restart. + + `${appName}`: e.g. Azure Data Studio. + Azure Data Studio @@ -217,6 +220,12 @@ The object explorer item context menu + + open the default settings JSON + + + Open Default Settings (JSON) + Please reload Azure Data Studio to disable this extension. @@ -238,9 +247,65 @@ Show Release Notes after an update. The Release Notes are opened in a new web browser window. + + Extension is not compatible with Azure Data Studio {0}. Extension requires: {1}. + + + Extension is not compatible with Azure Data Studio {0}. Extension requires a newer VS Code Engine Version {1}, which is newer than what is currently supported ({2}). + + + Could not parse `{0}` value {1}. Please use, for example: ^1.22.0, ^1.22.x, etc. + Configure glob patterns of file paths to exclude from file watching. Patterns must match on absolute paths, i.e. prefix with `**/` or the full path to match properly and suffix with `/**` to match files within a path (for example `**/build/output/**` or `/Users/name/workspaces/project/build/output/**`). Changing this setting requires a restart. When you experience Azure Data Studio consuming lots of CPU time on startup, you can exclude large folders to reduce the initial load. + + Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass `#terminal.integrated.commandsToSkipShell#`, setting this to false is particularly useful when you want ctrl+k to go to your shell (not Azure Data Studio). + + + A set of messages that when encountered in the terminal will be automatically responded to. Provided the message is specific enough, this can help automate away common responses. + +Remarks: + +- Use {0} to automatically respond to the terminate batch job prompt on Windows. +- The message includes escape sequences so the reply might not happen with styled text. +- Each reply can only happen once every second. +- Use {1} in the reply to mean the enter key. +- To unset a default key, set the value to null. +- Restart Azured Data Studio if new don't apply. + + + A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by Azure Data Studio. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open. + +  + +Many commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell. + +  + +The following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below. + +  + +Default Skipped Commands: + +{0} + + + Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since Azure Data Studio's terminal only supports UTF-8 encoded data coming from the shell. + + + Object with environment variables that will be added to the Azure Data Studio process to be used by the terminal on Linux. Set to `null` to delete the environment variable. + + + Object with environment variables that will be added to the Azure Data Studio process to be used by the terminal on macOS. Set to `null` to delete the environment variable. + + + Object with environment variables that will be added to the Azure Data Studio process to be used by the terminal on Windows. Set to `null` to delete the environment variable. + + + Whether new shells should inherit their environment from Azure Data Studio, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows. + Please reload Azure Data Studio to complete the uninstallation of the extension {0}. @@ -346,6 +411,9 @@ + + Could not find a serialization provider with the specified ID '{0}' + Cannot serialize data as no provider has been registered @@ -357,12 +425,12 @@ + + The button dropdown box shadow color + The button dropdown background hover color - - The button dropdown box shadow color - Callout dialog body background. @@ -839,6 +907,12 @@ + + False + + + True + General @@ -952,6 +1026,9 @@ Select + + Failed to generate script for Edit Data editor. + Failed to generate select script for the selected object. @@ -2270,6 +2347,9 @@ + + Icon represent a server. + Servers @@ -2350,6 +2430,9 @@ + + {0}, use arrow keys to navigate between nodes + Zoom level cannot be 0 or negative @@ -2418,6 +2501,12 @@ Zoom to fit + + Bottom execution Plan {0} + + + Top execution Plan {0} + Tooltips disabled @@ -2473,12 +2562,18 @@ + + When true, enables tooltips on hover for execution plan. When false, tooltips are shown on node click or F3 key press. + Compare execution plans Compare execution plans + + Execution Plan + @@ -2535,7 +2630,7 @@ - Query Plan (Preview) + Query Plan @@ -2549,7 +2644,7 @@ Select All - Plan Tree (Preview) + Plan Tree Execution Plan Tree @@ -2559,6 +2654,9 @@ Execution Plan Files + + Execution Plan {0} + Compare execution plan @@ -2626,7 +2724,7 @@ Select All - Top Operations (Preview) + Top Operations Top Operations @@ -3776,6 +3874,9 @@ Error: {1} + + Icon represent a notebook. + Notebooks @@ -4008,6 +4109,9 @@ Error: {1} Data + + Execution Plan + Notebook @@ -4529,6 +4633,9 @@ Error: {1} Resource Viewer + + Icon for resource viewer. + @@ -4753,6 +4860,17 @@ Error: {1} Yes (recommended) + + + + Azure Data Studio now has encryption enabled by default for all SQL Server connections. This may result in your existing connections no longer working.{0}We recommend you review the link below for more details. + + + More information + + + Important Update + @@ -5020,6 +5138,39 @@ Error: {1} The window will reload after installing additional support for {0}. + + + + &&Welcome + && denotes a mnemonic + + + Controls which editor is shown at startup, if none are restored from the previous session. + + + Open a new untitled file (only applies when opening an empty window). + This is the description for a setting. Values surrounded by single quotes are not to be translated. + + + Start without an editor. + This is the description for a setting. Values surrounded by single quotes are not to be translated. + + + Open the README when opening a folder that contains one, fallback to 'welcomePage' otherwise. Note: This is only observed as a global configuration, it will be ignored if set in a workspace or folder configuration. + This is the description for a setting. Values surrounded by single quotes are not to be translated. + + + Open the Welcome page, with content to aid in getting started with Azure Data Studio and extensions. + This is the description for a setting. Values surrounded by single quotes are not to be translated. + + + Open the Welcome page when opening an empty workbench. + This is the description for a setting. Values surrounded by single quotes are not to be translated. + + + 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. + @@ -5235,6 +5386,9 @@ Error: {1} Connection error + + Enable Trust server certificate + Connection failed due to Kerberos error. @@ -5247,9 +5401,6 @@ Error: {1} Run Kinit - - Enable Trust server certificate - Encryption was enabled on this connection, review your SSL and certificate configuration for the target SQL Server, or enable 'Trust server certificate' in the connection dialog. @@ -5330,6 +5481,12 @@ Error: {1} Advanced... + + False + + + True + Account @@ -5378,12 +5535,6 @@ Error: {1} Server group - - True - - - False - @@ -5441,6 +5592,9 @@ Error: {1} OK + + Read More + @@ -6561,4 +6715,4 @@ Error: {1} Show Getting Started - + \ No newline at end of file