Merge branch 'master' into pr/107705

extensions/git/package.nls.json

@@ -3,6 +3,7 @@
 	"description": "Git SCM Integration",
 	"command.setLogLevel": "Set Log Level...",
 	"command.clone": "Clone",
+	"command.cloneRecursive": "Clone (Recursive)",
 	"command.init": "Initialize Repository",
 	"command.openRepository": "Open Repository",
 	"command.close": "Close Repository",
@@ -22,6 +23,7 @@
 	"command.unstage": "Unstage Changes",
 	"command.unstageAll": "Unstage All Changes",
 	"command.unstageSelectedRanges": "Unstage Selected Ranges",
+	"command.rename": "Rename",
 	"command.clean": "Discard Changes",
 	"command.cleanAll": "Discard All Changes",
 	"command.cleanAllTracked": "Discard All Tracked Changes",
@@ -34,7 +36,7 @@
 	"command.commitAll": "Commit All",
 	"command.commitAllSigned": "Commit All (Signed Off)",
 	"command.commitAllAmend": "Commit All (Amend)",
-	"command.commitNoVerify": "Commit (No Nerify)",
+	"command.commitNoVerify": "Commit (No Verify)",
 	"command.commitStagedNoVerify": "Commit Staged (No Verify)",
 	"command.commitEmptyNoVerify": "Commit Empty (No Verify)",
 	"command.commitStagedSignedNoVerify": "Commit Staged (Signed Off, No Verify)",
@@ -45,11 +47,14 @@
 	"command.restoreCommitTemplate": "Restore Commit Template",
 	"command.undoCommit": "Undo Last Commit",
 	"command.checkout": "Checkout to...",
+	"command.checkoutDetached": "Checkout to (Detached)...",
 	"command.branch": "Create Branch...",
 	"command.branchFrom": "Create Branch From...",
 	"command.deleteBranch": "Delete Branch...",
 	"command.renameBranch": "Rename Branch...",
+	"command.cherryPick": "Cherry Pick...",
 	"command.merge": "Merge Branch...",
+	"command.rebase": "Rebase Branch...",
 	"command.createTag": "Create Tag",
 	"command.deleteTag": "Delete Tag",
 	"command.fetch": "Fetch",
@@ -64,6 +69,7 @@
 	"command.pushToForce": "Push to... (Force)",
 	"command.pushFollowTags": "Push (Follow Tags)",
 	"command.pushFollowTagsForce": "Push (Follow Tags, Force)",
+	"command.pushTags": "Push Tags",
 	"command.addRemote": "Add Remote...",
 	"command.removeRemote": "Remove Remote",
 	"command.sync": "Sync",
@@ -98,11 +104,10 @@
 	"config.countBadge.all": "Count all changes.",
 	"config.countBadge.tracked": "Count only tracked changes.",
 	"config.countBadge.off": "Turn off counter.",
-	"config.checkoutType": "Controls what type of branches are listed when running `Checkout to...`.",
-	"config.checkoutType.all": "Show all references.",
-	"config.checkoutType.local": "Show only local branches.",
-	"config.checkoutType.tags": "Show only tags.",
-	"config.checkoutType.remote": "Show only remote branches.",
+	"config.checkoutType": "Controls what type of git refs are listed when running `Checkout to...`.",
+	"config.checkoutType.local": "Local branches",
+	"config.checkoutType.tags": "Tags",
+	"config.checkoutType.remote": "Remote branches",
 	"config.branchValidationRegex": "A regular expression to validate new branch names.",
 	"config.branchWhitespaceChar": "The character to replace whitespace in new branch names.",
 	"config.ignoreLegacyWarning": "Ignores the legacy Git warning.",
@@ -119,6 +124,11 @@
 	"config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.",
 	"config.decorations.enabled": "Controls whether Git contributes colors and badges to the explorer and the open editors view.",
 	"config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.",
+	"config.followTagsWhenSync": "Follow push all tags when running the sync command.",
+	"config.promptToSaveFilesBeforeStash": "Controls whether Git should check for unsaved files before stashing changes.",
+	"config.promptToSaveFilesBeforeStash.always": "Check for any unsaved files.",
+	"config.promptToSaveFilesBeforeStash.staged": "Check only for unsaved staged files.",
+	"config.promptToSaveFilesBeforeStash.never": "Disable this check.",
 	"config.promptToSaveFilesBeforeCommit": "Controls whether Git should check for unsaved files before committing.",
 	"config.promptToSaveFilesBeforeCommit.always": "Check for any unsaved files.",
 	"config.promptToSaveFilesBeforeCommit.staged": "Check only for unsaved staged files.",
@@ -127,6 +137,11 @@
 	"config.postCommitCommand.none": "Don't run any command after a commit.",
 	"config.postCommitCommand.push": "Run 'Git Push' after a successful commit.",
 	"config.postCommitCommand.sync": "Run 'Git Sync' after a successful commit.",
+	"config.openAfterClone": "Controls whether to open a repository automatically after cloning.",
+	"config.openAfterClone.always": "Always open in current window.",
+	"config.openAfterClone.alwaysNewWindow": "Always open in a new window.",
+	"config.openAfterClone.whenNoFolderOpen": "Only open in current window when no folder is opened.",
+	"config.openAfterClone.prompt": "Always prompt for action.",
 	"config.showInlineOpenFileAction": "Controls whether to show an inline Open File action in the Git changes view.",
 	"config.showPushSuccessNotification": "Controls whether to show a notification when a push is successful.",
 	"config.inputValidation": "Controls when to show commit message input validation.",
@@ -136,6 +151,7 @@
 	"config.detectSubmodulesLimit": "Controls the limit of git submodules detected.",
 	"config.alwaysShowStagedChangesResourceGroup": "Always show the Staged Changes resource group.",
 	"config.alwaysSignOff": "Controls the signoff flag for all commits.",
+	"config.ignoreSubmodules": "Ignore modifications to submodules in the file tree.",
 	"config.ignoredRepositories": "List of git repositories to ignore.",
 	"config.scanRepositories": "List of paths to search for git repositories in.",
 	"config.showProgress": "Controls whether git actions should show progress.",
@@ -143,6 +159,7 @@
 	"config.confirmEmptyCommits": "Always confirm the creation of empty commits for the 'Git: Commit Empty' command.",
 	"config.fetchOnPull": "When enabled, fetch all branches when pulling. Otherwise, fetch just the current one.",
 	"config.pullTags": "Fetch all tags when pulling.",
+	"config.pruneOnFetch": "Prune when fetching.",
 	"config.autoStash": "Stash any changes before pulling and restore them after successful pull.",
 	"config.allowForcePush": "Controls whether force push (with or without lease) is enabled.",
 	"config.useForcePushWithLease": "Controls whether force pushing uses the safer force-with-lease variant.",
@@ -158,6 +175,12 @@
 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for git processes spawned in the integrated terminal. Note: terminals need to be restarted to pick up a change in this setting.",
+	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view",
+	"config.timeline.date": "Controls which date to use for items in the Timeline view",
+	"config.timeline.date.committed": "Use the committed date",
+	"config.timeline.date.authored": "Use the authored date",
+	"config.useCommitInputAsStashMessage": "Controls whether to use the message from the commit input box as the default stash message.",
+	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",
 	"submenu.commit.amend": "Amend",
 	"submenu.commit.signoff": "Sign Off",
@@ -166,6 +189,7 @@
 	"submenu.branch": "Branch",
 	"submenu.remotes": "Remote",
 	"submenu.stash": "Stash",
+	"submenu.tags": "Tags",
 	"colors.added": "Color for added resources.",
 	"colors.modified": "Color for modified resources.",
 	"colors.stageModified": "Color for modified resources which have been staged.",