Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

extensions/git/package.nls.json

@@ -11,6 +11,8 @@
 	"command.openHEADFile": "Open File (HEAD)",
 	"command.stage": "Stage Changes",
 	"command.stageAll": "Stage All Changes",
+	"command.stageAllTracked": "Stage All Tracked Changes",
+	"command.stageAllUntracked": "Stage All Untracked Changes",
 	"command.stageSelectedRanges": "Stage Selected Ranges",
 	"command.revertSelectedRanges": "Revert Selected Ranges",
 	"command.stageChange": "Stage Change",
@@ -20,6 +22,8 @@
 	"command.unstageSelectedRanges": "Unstage Selected Ranges",
 	"command.clean": "Discard Changes",
 	"command.cleanAll": "Discard All Changes",
+	"command.cleanAllTracked": "Discard All Tracked Changes",
+	"command.cleanAllUntracked": "Discard All Untracked Changes",
 	"command.commit": "Commit",
 	"command.commitStaged": "Commit Staged",
 	"command.commitEmpty": "Commit Empty",
@@ -37,6 +41,7 @@
 	"command.renameBranch": "Rename Branch...",
 	"command.merge": "Merge Branch...",
 	"command.createTag": "Create Tag",
+	"command.deleteTag": "Delete Tag",
 	"command.fetch": "Fetch",
 	"command.fetchPrune": "Fetch (Prune)",
 	"command.fetchAll": "Fetch From All Remotes",
@@ -56,13 +61,14 @@
 	"command.publish": "Publish Branch...",
 	"command.showOutput": "Show Git Output",
 	"command.ignore": "Add to .gitignore",
-	"command.revealInExplorer": "Reveal in Explorer",
+	"command.revealInExplorer": "Reveal in Side Bar",
 	"command.stashIncludeUntracked": "Stash (Include Untracked)",
 	"command.stash": "Stash",
 	"command.stashPop": "Pop Stash...",
 	"command.stashPopLatest": "Pop Latest Stash",
 	"command.stashApply": "Apply Stash...",
 	"command.stashApplyLatest": "Apply Latest Stash",
+	"command.stashDrop": "Drop Stash...",
 	"config.enabled": "Whether git is enabled.",
 	"config.path": "Path and filename of the git executable, e.g. `C:\\Program Files\\Git\\bin\\git.exe` (Windows).",
 	"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",
@@ -119,7 +125,7 @@
 	"config.scanRepositories": "List of paths to search for git repositories in.",
 	"config.showProgress": "Controls whether git actions should show progress.",
 	"config.rebaseWhenSync": "Force git to use rebase when running the sync command.",
-	"config.confirmEmptyCommits": "Always confirm the creation of empty commits.",
+	"config.confirmEmptyCommits": "Always confirm the creation of empty commits for the 'Git: Commit Empty' command.",
 	"config.fetchOnPull": "Fetch all branches when pulling or just the current one.",
 	"config.pullTags": "Fetch all tags when pulling.",
 	"config.autoStash": "Stash any changes before pulling and restore them after successful pull.",
@@ -129,6 +135,10 @@
 	"config.openDiffOnClick": "Controls whether the diff editor should be opened when clicking a change. Otherwise the regular editor will be opened.",
 	"config.supportCancellation": "Controls whether a notification comes up when running the Sync action, which allows the user to cancel the operation.",
 	"config.branchSortOrder": "Controls the sort order for branches.",
+	"config.untrackedChanges": "Controls how untracked changes behave.",
+	"config.untrackedChanges.mixed": "All changes, tracked and untracked, appear together and behave equally.",
+	"config.untrackedChanges.separate": "Untracked changes appear separately in the Source Control view. They are also excluded from several actions.",
+	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
 	"colors.added": "Color for added resources.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",