From fa0fe29791bfd4ba9f79445aa18515fbe15db078 Mon Sep 17 00:00:00 2001
From: jogo- <jogo@laposte.net>
Date: Fri, 21 May 2021 19:22:36 +0200
Subject: [PATCH 1/7] Fix typo in package.nls.json (#7568)

---
 Extension/package.nls.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Extension/package.nls.json b/Extension/package.nls.json
index 348cd6978c..eee78b5255 100644
--- a/Extension/package.nls.json
+++ b/Extension/package.nls.json
@@ -213,7 +213,7 @@
     "c_cpp.debuggers.miDebuggerArgs.description": "Additional arguments for the MI debugger (such as gdb).",
     "c_cpp.debuggers.miDebuggerServerAddress.description": "Network address of the MI Debugger Server to connect to (example: localhost:1234).",
     "c_cpp.debuggers.stopAtEntry.description": "Optional parameter. If true, the debugger should stop at the entrypoint of the target. If processId is passed, has no effect.",
-    "c_cpp.debuggers.debugServerPath.description": "Optional full path to debug server to launch. Defaults to null. It is used in conjuction of either \"miDebugServerAddress\" or your own server with a \"customSetupCommand\" that runs \"-target-select remote <server:port>\"`.",
+    "c_cpp.debuggers.debugServerPath.description": "Optional full path to debug server to launch. Defaults to null. It is used in conjunction of either \"miDebugServerAddress\" or your own server with a \"customSetupCommand\" that runs \"-target-select remote <server:port>\"`.",
     "c_cpp.debuggers.debugServerArgs.description": "Optional debug server args. Defaults to null.",
     "c_cpp.debuggers.serverStarted.description": "Optional server-started pattern to look for in the debug server output. Defaults to null.",
     "c_cpp.debuggers.filterStdout.description": "Search stdout stream for server-started pattern and log stdout to debug output. Defaults to true.",

From 357cc3fdc1f0d2aa1d7a988144dc29bfafb32a80 Mon Sep 17 00:00:00 2001
From: csigs <csigs@users.noreply.github.com>
Date: Fri, 21 May 2021 11:32:08 -0700
Subject: [PATCH 2/7] Localization - Translated Strings (#7567)

---
 Extension/i18n/chs/package.i18n.json    | 1 +
 Extension/i18n/chs/src/common.i18n.json | 3 ++-
 Extension/i18n/cht/package.i18n.json    | 1 +
 Extension/i18n/cht/src/common.i18n.json | 3 ++-
 Extension/i18n/csy/package.i18n.json    | 1 +
 Extension/i18n/csy/src/common.i18n.json | 3 ++-
 Extension/i18n/deu/package.i18n.json    | 1 +
 Extension/i18n/deu/src/common.i18n.json | 3 ++-
 Extension/i18n/esn/package.i18n.json    | 1 +
 Extension/i18n/esn/src/common.i18n.json | 3 ++-
 Extension/i18n/fra/package.i18n.json    | 1 +
 Extension/i18n/fra/src/common.i18n.json | 3 ++-
 Extension/i18n/ita/package.i18n.json    | 1 +
 Extension/i18n/ita/src/common.i18n.json | 3 ++-
 Extension/i18n/jpn/package.i18n.json    | 1 +
 Extension/i18n/jpn/src/common.i18n.json | 3 ++-
 Extension/i18n/kor/package.i18n.json    | 1 +
 Extension/i18n/kor/src/common.i18n.json | 3 ++-
 Extension/i18n/plk/package.i18n.json    | 1 +
 Extension/i18n/plk/src/common.i18n.json | 3 ++-
 Extension/i18n/ptb/package.i18n.json    | 1 +
 Extension/i18n/ptb/src/common.i18n.json | 3 ++-
 Extension/i18n/rus/package.i18n.json    | 1 +
 Extension/i18n/rus/src/common.i18n.json | 3 ++-
 Extension/i18n/trk/package.i18n.json    | 1 +
 Extension/i18n/trk/src/common.i18n.json | 3 ++-
 26 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/Extension/i18n/chs/package.i18n.json b/Extension/i18n/chs/package.i18n.json
index a5401caed0..5f3198a8d9 100644
--- a/Extension/i18n/chs/package.i18n.json
+++ b/Extension/i18n/chs/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "如果为 true，调试程序 shell 命令替换将使用过时的反引号(`)。",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: 其他引用结果",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "如果存在，这会指示调试程序使用其他可执行文件作为管道来连接到远程计算机，此管道将在 VS Code 和已启用 MI 的调试程序后端可执行文件(如 gdb)之间中继标准输入/输入。",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "输入管道程序名称的完全限定路径，例如 \"/usr/bin/ssh\"",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "目标计算机上调试程序的完整路径，例如 /usr/bin/gdb。",
diff --git a/Extension/i18n/chs/src/common.i18n.json b/Extension/i18n/chs/src/common.i18n.json
index 1033aa0955..a9f2d939bb 100644
--- a/Extension/i18n/chs/src/common.i18n.json
+++ b/Extension/i18n/chs/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "警告: 尚未为此平台测试调试。",
 	"reload.workspace.for.changes": "重新加载工作区以使设置更改生效。",
 	"reload.string": "重新加载",
-	"invalid.download.location.received": "接收的下载位置无效"
+	"invalid.download.location.received": "接收的下载位置无效",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/cht/package.i18n.json b/Extension/i18n/cht/package.i18n.json
index 8553b04952..59e1d68aec 100644
--- a/Extension/i18n/cht/package.i18n.json
+++ b/Extension/i18n/cht/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "若為 true，偵錯工具殼層命令替代將會使用已淘汰的反引號 (`)。",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: 其他參考結果",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "出現時，會指示偵錯工具使用另一個可執行檔來連線至遠端電腦，該管道會在 VS Code 與 MI 啟用偵錯工具後端可執行檔之間傳送標準輸入/輸出 (例如 gdb)。",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "輸入管道程式名稱的完整路徑，例如 '/usr/bin/ssh'",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "目標機器的偵錯工具完整路徑，例如 /use/bin/gdb。",
diff --git a/Extension/i18n/cht/src/common.i18n.json b/Extension/i18n/cht/src/common.i18n.json
index 1c40ef366b..beb74d26ce 100644
--- a/Extension/i18n/cht/src/common.i18n.json
+++ b/Extension/i18n/cht/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "警告: 尚未針對此平台測試偵錯。",
 	"reload.workspace.for.changes": "請重新載入工作區以讓設定變更生效。",
 	"reload.string": "重新載入",
-	"invalid.download.location.received": "收到的下載位置無效"
+	"invalid.download.location.received": "收到的下載位置無效",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/csy/package.i18n.json b/Extension/i18n/csy/package.i18n.json
index 244c4685e5..0c9daebd1a 100644
--- a/Extension/i18n/csy/package.i18n.json
+++ b/Extension/i18n/csy/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Další kontrola položek na stejné úrovni u odpovídajícího souboru. Jako proměnnou názvu odpovídajícího souboru použijte $(basename).",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Když se nastaví na true, nahrazování příkazů shellu ladicího programu bude používat starou verzi obrácené čárky (`).",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: výsledky jiných odkazů",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Pokud je k dispozici, předá ladicímu programu informaci, aby se připojil ke vzdálenému počítači pomocí dalšího spustitelného souboru jako kanál, který bude přenášet standardní vstup a výstup mezi nástrojem VS Code a spustitelným souborem back-endu ladicího programu s podporou MI (třeba gdb).",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "zadejte plně kvalifikovanou cestu názvu programu kanálu, třeba /usr/bin/ssh",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Úplná cesta k ladicímu programu na cílovém počítači, například /usr/bin/gdb",
diff --git a/Extension/i18n/csy/src/common.i18n.json b/Extension/i18n/csy/src/common.i18n.json
index c6c565aa6a..662032e46f 100644
--- a/Extension/i18n/csy/src/common.i18n.json
+++ b/Extension/i18n/csy/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Upozornění: Ladění se pro tuto platformu netestovalo.",
 	"reload.workspace.for.changes": "Načtěte pracovní prostor znovu, aby se změna nastavení projevila.",
 	"reload.string": "Načíst znovu",
-	"invalid.download.location.received": "Přijato neplatné umístění pro stahování"
+	"invalid.download.location.received": "Přijato neplatné umístění pro stahování",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/deu/package.i18n.json b/Extension/i18n/deu/package.i18n.json
index 760ef00279..341a0cadae 100644
--- a/Extension/i18n/deu/package.i18n.json
+++ b/Extension/i18n/deu/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Bei Festlegung auf TRUE verwendet die Befehlsersetzung der Debugger-Shell obsolete Backtick-Zeichen (`).",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: andere Verweisergebnisse",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Falls angegeben, weist diese Option den Debugger an, eine Verbindung mit einem Remotecomputer mithilfe einer anderen ausführbaren Datei als Pipe herzustellen, die Standardeingaben/-ausgaben zwischen VS Code und der ausführbaren Back-End-Datei für den MI-fähigen Debugger weiterleitet (z. B. gdb).",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "Vollqualifizierten Pfad für den Pipeprogrammnamen eingeben, z. B. \"/usr/bin/ssh\"",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Der vollständige Pfad zum Debugger auf dem Zielcomputer, z. B. \"/usr/bin/gdb\".",
diff --git a/Extension/i18n/deu/src/common.i18n.json b/Extension/i18n/deu/src/common.i18n.json
index d0570ad6a5..5cd1255ec9 100644
--- a/Extension/i18n/deu/src/common.i18n.json
+++ b/Extension/i18n/deu/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Warnung: Das Debugging wurde für diese Plattform nicht getestet.",
 	"reload.workspace.for.changes": "Laden Sie den Arbeitsbereich neu, damit die Einstellungsänderung wirksam wird.",
 	"reload.string": "Aktualisieren",
-	"invalid.download.location.received": "Ungültiger Downloadspeicherort empfangen."
+	"invalid.download.location.received": "Ungültiger Downloadspeicherort empfangen.",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/esn/package.i18n.json b/Extension/i18n/esn/package.i18n.json
index c8748c0ff7..d9621f6433 100644
--- a/Extension/i18n/esn/package.i18n.json
+++ b/Extension/i18n/esn/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Si es true, la sustitución de comandos del shell del depurador usará la marca de comilla simple (') obsoleta.",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: resultados de otras referencias",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Cuando se especifica, indica al depurador que se conecte a un equipo remoto usando otro archivo ejecutable como canalización que retransmitirá la entrada o la salida estándar entre VS Code y el archivo ejecutable del back-end del depurador habilitado para MI (por ejemplo, gdb).",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "Escriba la ruta de acceso completa para el nombre del programa de canalización; por ejemplo, \"/usr/bin/ssh\".",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Ruta de acceso completa al depurador en la máquina de destino. Por ejemplo, /usr/bin/gdb.",
diff --git a/Extension/i18n/esn/src/common.i18n.json b/Extension/i18n/esn/src/common.i18n.json
index 886906cf4e..e7242227bf 100644
--- a/Extension/i18n/esn/src/common.i18n.json
+++ b/Extension/i18n/esn/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Advertencia: La depuración no se ha probado para esta plataforma.",
 	"reload.workspace.for.changes": "Recargue el área de trabajo para que el cambio de configuración surta efecto.",
 	"reload.string": "Volver a cargar",
-	"invalid.download.location.received": "Se ha recibido una ubicación de descarga no válida."
+	"invalid.download.location.received": "Se ha recibido una ubicación de descarga no válida.",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/fra/package.i18n.json b/Extension/i18n/fra/package.i18n.json
index ff33281fda..b8d6cf88c2 100644
--- a/Extension/i18n/fra/package.i18n.json
+++ b/Extension/i18n/fra/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Si la valeur est true, le remplacement de la commande d'interpréteur de commandes du débogueur utilise un accent grave (`) obsolète.",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++ : Autres résultats des références",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Quand ce paramètre est présent, indique au débogueur de se connecter à un ordinateur distant en se servant d'un autre exécutable comme canal de relais d'entrée/de sortie standard entre VS Code et l'exécutable du back-end du débogueur MI (par exemple, gdb).",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "entrez le chemin complet du nom du programme de canal, par exemple '/usr/bin/ssh'",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Chemin complet du débogueur sur la machine cible, par exemple /usr/bin/gdb.",
diff --git a/Extension/i18n/fra/src/common.i18n.json b/Extension/i18n/fra/src/common.i18n.json
index 334ac18b0a..6f024fd743 100644
--- a/Extension/i18n/fra/src/common.i18n.json
+++ b/Extension/i18n/fra/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Avertissement : Le débogage n'a pas été testé pour cette plateforme.",
 	"reload.workspace.for.changes": "Rechargez l'espace de travail pour appliquer les changements des paramètres.",
 	"reload.string": "Recharger",
-	"invalid.download.location.received": "Emplacement de téléchargement reçu non valide"
+	"invalid.download.location.received": "Emplacement de téléchargement reçu non valide",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/ita/package.i18n.json b/Extension/i18n/ita/package.i18n.json
index c14d4f52cf..45b023b972 100644
--- a/Extension/i18n/ita/package.i18n.json
+++ b/Extension/i18n/ita/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Se è true, per la sostituzione del comando della shell del debugger verrà usato il carattere backtick obsoleto (`).",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: Risultati altri riferimenti",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Se presente, indica al debugger di connettersi a un computer remoto usando come pipe un altro eseguibile che inoltra l'input/output standard tra VS Code e l'eseguibile back-end del debugger abilitato per MI, ad esempio gdb.",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "immettere il percorso completo per il nome del programma pipe, ad esempio '/usr/bin/ssh'",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Percorso completo del debugger nel computer di destinazione, ad esempio /usr/bin/gdb.",
diff --git a/Extension/i18n/ita/src/common.i18n.json b/Extension/i18n/ita/src/common.i18n.json
index d6a5d1c960..2cdfe40fe9 100644
--- a/Extension/i18n/ita/src/common.i18n.json
+++ b/Extension/i18n/ita/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Avviso: il debug non è stato testato per questa piattaforma.",
 	"reload.workspace.for.changes": "Ricaricare l'area di lavoro per rendere effettive le modifiche apportate alle impostazioni.",
 	"reload.string": "Ricarica",
-	"invalid.download.location.received": "È stato ricevuto un percorso di download non valido"
+	"invalid.download.location.received": "È stato ricevuto un percorso di download non valido",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/jpn/package.i18n.json b/Extension/i18n/jpn/package.i18n.json
index 0458ed4d55..a9cd2f77c9 100644
--- a/Extension/i18n/jpn/package.i18n.json
+++ b/Extension/i18n/jpn/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "True の場合、デバッガー シェルのコマンド置換では古いバックティック (') が使用されます。",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: その他の参照結果",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "これを指定すると、デバッガーにより、別の実行可能ファイルをパイプとして使用してリモート コンピューターに接続され、VS Code と MI 対応のデバッガー バックエンド実行可能ファイル (gdb など) との間で標準入出力が中継されます。",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "パイプ プログラム名の完全修飾パスを入力してください (例: '/usr/bin/ssh')",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "対象マシン上のデバッガーへの完全なパス。例: /usr/bin/gdb。",
diff --git a/Extension/i18n/jpn/src/common.i18n.json b/Extension/i18n/jpn/src/common.i18n.json
index 0296ba5987..1a39242c29 100644
--- a/Extension/i18n/jpn/src/common.i18n.json
+++ b/Extension/i18n/jpn/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "警告: このプラットフォームのデバッグはテストされていません。",
 	"reload.workspace.for.changes": "設定の変更を有効にするには、ワークスペースを再度読み込んでください。",
 	"reload.string": "再読み込み",
-	"invalid.download.location.received": "無効なダウンロード場所を受信しました"
+	"invalid.download.location.received": "無効なダウンロード場所を受信しました",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/kor/package.i18n.json b/Extension/i18n/kor/package.i18n.json
index adb777cad3..4417db9d53 100644
--- a/Extension/i18n/kor/package.i18n.json
+++ b/Extension/i18n/kor/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "true인 경우 디버거 셸 명령 대체가 사용되지 않는 백틱(`)을 사용합니다.",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: 기타 참조 결과",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "있을 경우 VS Code와 MI 지원 디버거 백 엔드 실행 파일(예: gdb) 사이에 표준 입출력을 릴레이하는 파이프로 다른 실행 파일을 사용하여 원격 컴퓨터에 연결되도록 디버거를 지정합니다.",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "파이프 프로그램 이름의 정규화된 경로 입력(예: '/usr/bin/ssh')",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "대상 컴퓨터에서 디버거의 전체 경로(예: /usr/bin/gdb)입니다.",
diff --git a/Extension/i18n/kor/src/common.i18n.json b/Extension/i18n/kor/src/common.i18n.json
index 612b6441f0..5de4098043 100644
--- a/Extension/i18n/kor/src/common.i18n.json
+++ b/Extension/i18n/kor/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "경고: 디버깅이 이 플랫폼에서 테스트되지 않았습니다.",
 	"reload.workspace.for.changes": "설정 변경 내용을 적용하려면 작업 영역을 다시 로드합니다.",
 	"reload.string": "다시 로드",
-	"invalid.download.location.received": "잘못된 다운로드 위치가 수신되었습니다."
+	"invalid.download.location.received": "잘못된 다운로드 위치가 수신되었습니다.",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/plk/package.i18n.json b/Extension/i18n/plk/package.i18n.json
index 497df08317..682888735a 100644
--- a/Extension/i18n/plk/package.i18n.json
+++ b/Extension/i18n/plk/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Dodatkowe sprawdzenie elementów równorzędnych pasującego pliku. Użyj ciągu $(basename) jako zmiennej dla nazwy pasującego pliku.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Jeśli wartość będzie równa true, podstawianie poleceń powłoki debugera będzie używać przestarzałego grawisa (`).",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: inne wyniki odwołań",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Jeśli jest obecny, zawiera instrukcje dla debugera, aby połączył się z komputerem zdalnym przy użyciu innego pliku wykonywalnego jako potoku, który będzie przekazywał standardowe wejście/wyjście między programem VS Code a plikiem wykonywalnym zaplecza debugera z włączoną obsługą indeksu MI (takim jak gdb).",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "wprowadź w pełni kwalifikowaną ścieżkę na potrzeby nazwy programu potoku, na przykład „/usr/bin/ssh”",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Pełna ścieżka do debugera na komputerze docelowym, na przykład /usr/bin/gdb.",
diff --git a/Extension/i18n/plk/src/common.i18n.json b/Extension/i18n/plk/src/common.i18n.json
index fa68af3bb9..a9d962a5fe 100644
--- a/Extension/i18n/plk/src/common.i18n.json
+++ b/Extension/i18n/plk/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Ostrzeżenie: nie przetestowano debugowania dla tej platformy.",
 	"reload.workspace.for.changes": "Załaduj ponownie obszar roboczy, aby zmiany ustawień zostały zastosowane.",
 	"reload.string": "Załaduj ponownie",
-	"invalid.download.location.received": "Odebrano nieprawidłową lokalizację pobierania"
+	"invalid.download.location.received": "Odebrano nieprawidłową lokalizację pobierania",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/ptb/package.i18n.json b/Extension/i18n/ptb/package.i18n.json
index bb3f77e029..c5672ad929 100644
--- a/Extension/i18n/ptb/package.i18n.json
+++ b/Extension/i18n/ptb/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Verificação adicional nos irmãos de um arquivo correspondente. Use $(basename) como variável para o nome do arquivo correspondente.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Se esta configuração for true, a substituição do comando do shell do depurador usará o acento grave obsoleto (`).",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: outros resultados de referências",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Quando presente, isso instrui o depurador a conectar-se a um computador remoto usando outro executável como um pipe que retransmitirá a entrada/saída padrão entre o VS Code e o executável do back-end do depurador habilitado para MI (como gdb).",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "insira o caminho totalmente qualificado para o nome do programa do pipe, por exemplo '/usr/bin/ssh'",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "O caminho completo para o depurador no computador de destino, por exemplo, /usr/bin/gdb.",
diff --git a/Extension/i18n/ptb/src/common.i18n.json b/Extension/i18n/ptb/src/common.i18n.json
index b247f9830a..995202cba9 100644
--- a/Extension/i18n/ptb/src/common.i18n.json
+++ b/Extension/i18n/ptb/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Aviso: a depuração não foi testada para esta plataforma.",
 	"reload.workspace.for.changes": "Recarregue o workspace para que a alteração das configurações entre em vigor.",
 	"reload.string": "Recarregar",
-	"invalid.download.location.received": "Recebido um local de download inválido"
+	"invalid.download.location.received": "Recebido um local de download inválido",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/rus/package.i18n.json b/Extension/i18n/rus/package.i18n.json
index 19143ca001..ebfd138d71 100644
--- a/Extension/i18n/rus/package.i18n.json
+++ b/Extension/i18n/rus/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Если задано значение true, для подстановки команд оболочки отладчика будет использоваться устаревший обратный апостроф (`).",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: результаты по другим ссылкам",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "При наличии сообщает отладчику о необходимости подключения к удаленному компьютеру с помощью другого исполняемого файла в качестве канала, который будет пересылать стандартный ввод и вывод между VS Code и исполняемым файлом отладчика с поддержкой MI в серверной части (например, gdb).",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "Введите полный путь к имени программы канала, например: \"/usr/bin/ssh\"",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Полный путь к отладчику на конечном компьютере, например: /usr/bin/gdb.",
diff --git a/Extension/i18n/rus/src/common.i18n.json b/Extension/i18n/rus/src/common.i18n.json
index d77fa4e6a6..2c74f7881f 100644
--- a/Extension/i18n/rus/src/common.i18n.json
+++ b/Extension/i18n/rus/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Предупреждение: отладка не тестировалась на этой платформе.",
 	"reload.workspace.for.changes": "Перезагрузите рабочую область, чтобы изменения параметров вступили в силу.",
 	"reload.string": "Перезагрузить",
-	"invalid.download.location.received": "Получено недопустимое расположение скачивания"
+	"invalid.download.location.received": "Получено недопустимое расположение скачивания",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file
diff --git a/Extension/i18n/trk/package.i18n.json b/Extension/i18n/trk/package.i18n.json
index a0e3d55809..e454b9734d 100644
--- a/Extension/i18n/trk/package.i18n.json
+++ b/Extension/i18n/trk/package.i18n.json
@@ -176,6 +176,7 @@
 	"c_cpp.configuration.filesExcludeWhen.description": "Eşleşen bir dosyanın eşdüzey öğeleri üzerinde ek denetim. Eşleşen dosya adı için değişken olarak $(basename) kullanın.",
 	"c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "True ise, hata ayıklayıcı kabuk komut değiştirme eski kesme işaretini (`) kullanır.",
 	"c_cpp.contributes.views.cppReferencesView.title": "C/C++: Diğer başvuru sonuçları",
+	"c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
 	"c_cpp.debuggers.pipeTransport.description": "Mevcut olduğunda, hata ayıklayıcısına, VS Code ile MI özellikli hata ayıklayıcısı arka uç yürütülebilir dosyası (gdb gibi) arasında standart giriş/çıkış geçişi sağlayan bir kanal olarak görev yapacak başka bir yürütülebilir dosya aracılığıyla uzak bilgisayara bağlanmasını söyler.",
 	"c_cpp.debuggers.pipeTransport.default.pipeProgram": "Kanal program adı için tam yolu girin, örneğin '/usr/bin/ssh'",
 	"c_cpp.debuggers.pipeTransport.default.debuggerPath": "Hedef makinedeki hata ayıklayıcısının tam yolu. Örneğin: /usr/bin/gdb.",
diff --git a/Extension/i18n/trk/src/common.i18n.json b/Extension/i18n/trk/src/common.i18n.json
index 55b0b6a621..f04bb73235 100644
--- a/Extension/i18n/trk/src/common.i18n.json
+++ b/Extension/i18n/trk/src/common.i18n.json
@@ -12,5 +12,6 @@
 	"warning.debugging.not.tested": "Uyarı: Bu platform için hata ayıklama test edilmedi.",
 	"reload.workspace.for.changes": "Ayar değişikliklerinin etkili olması için çalışma alanını yeniden yükleyin.",
 	"reload.string": "Yeniden yükle",
-	"invalid.download.location.received": "Geçersiz indirme konumu alındı"
+	"invalid.download.location.received": "Geçersiz indirme konumu alındı",
+	"c.cpp.symbolscope.separator": "{0}, {1}"
 }
\ No newline at end of file

From 61ef05afc801d54be8b22bdc47e4d43766284583 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Fri, 21 May 2021 13:45:37 -0700
Subject: [PATCH 3/7] Fix typos. (#7573)

* Fix typos.
---
 Extension/src/LanguageServer/configurations.ts | 2 +-
 Extension/src/common.ts                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
index d861a47e28..ad250170ef 100644
--- a/Extension/src/LanguageServer/configurations.ts
+++ b/Extension/src/LanguageServer/configurations.ts
@@ -870,7 +870,7 @@ export class CppProperties {
                     && settings.defaultIntelliSenseMode === ""
                     && settings.defaultConfigurationProvider === "";
 
-                // Only keep a cached custom browse config if there is an emptry configuration,
+                // Only keep a cached custom browse config if there is an empty configuration,
                 // or if a specified provider ID has not changed.
                 let keepCachedBrowseConfig: boolean = true;
                 if (hasEmptyConfiguration) {
diff --git a/Extension/src/common.ts b/Extension/src/common.ts
index 3d5bc68f9c..ab08d6e9c1 100644
--- a/Extension/src/common.ts
+++ b/Extension/src/common.ts
@@ -1146,7 +1146,7 @@ export function getLocalizedString(params: LocalizeStringParams): string {
 export function getLocalizedSymbolScope(scope: string, detail: string): string {
     return localize({
         key: "c.cpp.symbolscope.separator", comment:
-            ["{0} is an untranslated C++ keyword (e.g. \"private\") and {1} is either another keyword (e.g. \"typedef\") or a localized property (e.g. a localized verison of \"declaration\""]
+            ["{0} is an untranslated C++ keyword (e.g. \"private\") and {1} is either another keyword (e.g. \"typedef\") or a localized property (e.g. a localized version of \"declaration\""]
     }, "{0}, {1}", scope, detail);
 }
 

From 3150de06ca46d5d264b41d15cf2155c837f16f63 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Tue, 25 May 2021 13:31:08 -0700
Subject: [PATCH 4/7] Fix package.nls.json issues. (#7581)

* Fix package.nls.json issues.
* Update changelog.
---
 Extension/CHANGELOG.md     | 12 +++++++++---
 Extension/package.nls.json | 14 +++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
index ad888c9c5a..1689aa5b35 100644
--- a/Extension/CHANGELOG.md
+++ b/Extension/CHANGELOG.md
@@ -1,16 +1,21 @@
 # C/C++ for Visual Studio Code Change Log
 
-## Version 1.4.0-insiders3: May 24, 2021
+## Version 1.4.0-insiders3: May 25, 2021
 ### Enhancements
 * Add `private` or `protected` scope labels to class symbols. [#7120](https://github.com/microsoft/vscode-cpptools/issues/7120)
 * Improvements to the C++ "Getting Started" walkthrough. [PR #7554](https://github.com/microsoft/vscode-cpptools/pull/7554)
 
 ### Bug Fixes
+* Switch to showing no document symbols instead of random symbols for `files.exclude`'d documents. [#5142](https://github.com/microsoft/vscode-cpptools/issues/5142)
 * Fix bitness detection for compilers targeting esp32. [#7034](https://github.com/microsoft/vscode-cpptools/issues/7034)
 * Fix issue with cpptools process lingering when no longer needed.  [#7262](https://github.com/microsoft/vscode-cpptools/issues/7262)
+* Fix typos.
+  * jogo- (@jogo-) [PR #7509](https://github.com/microsoft/vscode-cpptools/pull/7509), [PR #7568](https://github.com/microsoft/vscode-cpptools/pull/7568), [PR #7573](https://github.com/microsoft/vscode-cpptools/pull/7573)
 * Fix enabling of the `ms_extensions` flag for clang on Windows. [#7529](https://github.com/microsoft/vscode-cpptools/issues/7529)
 * Fix `autocompleteAddParentheses` with no argument const/non-const overloads and deduction guides. [#7540](https://github.com/microsoft/vscode-cpptools/issues/7540), [#7541](https://github.com/microsoft/vscode-cpptools/issues/7541)
+* Fix the browse configuration not being preserved when the configuration provider is auto-detected. [#7542](https://github.com/microsoft/vscode-cpptools/issues/7542)
 * Fix clang-format failure on macOS 10.13 or older. [#7561](https://github.com/microsoft/vscode-cpptools/issues/7561)
+* Fix the walkthrough for remote targets. [PR #7582](https://github.com/microsoft/vscode-cpptools/pull/7582)
 * Prevent 'Configuration Warnings' output when a custom configuration provider omits optional fields.
 * Prevent 'Configuration Warnings' caused by corrections to auto-detected default configuration values.
 
@@ -22,12 +27,13 @@
 ### Bug Fixes
 * Fix an incorrect IntelliSense error with object initialization. [#3212](https://github.com/microsoft/vscode-cpptools/issues/3212)
 * Fix macros getting undefined when duplicate `#include` are used. [#5182](https://github.com/microsoft/vscode-cpptools/issues/5182), [#7270](https://github.com/microsoft/vscode-cpptools/issues/7270)
-* Fix IntelliSense crash with `#pragma GCC target`. [#6698](https://github.com/microsoft/vscode-cpptools/issues/6698), [#7377](https://github.com/microsoft/vscode-cpptools/issues/7377)
+* Fix an IntelliSense crash with `#pragma GCC target`. [#6698](https://github.com/microsoft/vscode-cpptools/issues/6698), [#7377](https://github.com/microsoft/vscode-cpptools/issues/7377)
 * Fix completion at the end of a file. [#7472](https://github.com/microsoft/vscode-cpptools/issues/7472)
 * Fix completion of constructors. [#7505](https://github.com/microsoft/vscode-cpptools/issues/7505)
-* Fix IntelliSense crash with the arrow library. [#7518](https://github.com/microsoft/vscode-cpptools/issues/7518)
+* Fix an IntelliSense crash with the arrow library. [#7518](https://github.com/microsoft/vscode-cpptools/issues/7518)
 * Fix the configuration UI randomly being blank (more frequently when remote). [#7523](https://github.com/microsoft/vscode-cpptools/issues/7523)
 * Fix IntelliSense mode switching from `linux` to `macos` if `__unix__` is defined but `__linux__` is not. [#7525](https://github.com/microsoft/vscode-cpptools/issues/7525)
+* Fix an IntelliSense crash with std::ranges::unique. [#7576](https://github.com/microsoft/vscode-cpptools/issues/7576)
 * Reduce IntelliSense memory and CPU usage in certain scenarios.
 
 ## Version 1.4.0-insiders: May 10, 2021
diff --git a/Extension/package.nls.json b/Extension/package.nls.json
index eee78b5255..89c82374d9 100644
--- a/Extension/package.nls.json
+++ b/Extension/package.nls.json
@@ -31,9 +31,9 @@
     "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.outermostParenthesis.description": "Indent new line relative to the outermost open parenthesis.",
     "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.innermostParenthesis.description": "Indent new line relative to the innermost open parenthesis.",
     "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.statementBegin.description": "Indent new line relative to the beginning of the current statement.",
-    "c_cpp.configuration.vcFormat.indent.withinParentheses.description": "When a new line is typed, it is aligned under the opening parenthesis or based on `C_Cpp.vcFormat.indent.multiLineRelativeTo`.",
+    "c_cpp.configuration.vcFormat.indent.withinParentheses.description": "When a new line is typed, it is aligned under the opening parenthesis or based on \"C_Cpp.vcFormat.indent.multiLineRelativeTo\".",
     "c_cpp.configuration.vcFormat.indent.withinParentheses.alignToParenthesis.description": "New line is aligned under the opening parenthesis.",
-    "c_cpp.configuration.vcFormat.indent.withinParentheses.indent.description": "New line is indented based on `C_Cpp.vcFormat.indent.multiLineRelativeTo`.",
+    "c_cpp.configuration.vcFormat.indent.withinParentheses.indent.description": "New line is indented based on \"C_Cpp.vcFormat.indent.multiLineRelativeTo\".",
     "c_cpp.configuration.vcFormat.indent.preserveWithinParentheses.description": "In existing code, preserve the existing indent alignment of new lines within parentheses.",
     "c_cpp.configuration.vcFormat.indent.caseLabels.description": "Labels are indented relative to switch statements by the amount specified in the Editor: Tab Size setting.",
     "c_cpp.configuration.vcFormat.indent.caseContents.description": "Code inside case block is indented relative to its label by the amount specified in the Editor: Tab Size setting",
@@ -111,7 +111,7 @@
     "c_cpp.configuration.vcFormat.wrap.preserveBlocks.oneLiners.description": "A complete code block that is entered on one line is kept on one line, regardless of the values of any of the VC Format: New Line settings",
     "c_cpp.configuration.vcFormat.wrap.preserveBlocks.allOneLineScopes.description": "Any code where the opening and closing brace is entered on one line is kept on one line, regardless of the values of any of the VC Format: New Line settings",
     "c_cpp.configuration.vcFormat.wrap.preserveBlocks.never.description": "Code blocks are always formatted based on the values of the VC Format: New Line settings",
-    "c_cpp.configuration.clang_format_path.description": "The full path of the clang-format executable. If not specified, and clang-format is available in the environment path, that is used.  If not found in the environment path, a copy of clang-format bundled with the extension will be used.",
+    "c_cpp.configuration.clang_format_path.description": "The full path of the clang-format executable. If not specified, and clang-format is available in the environment path, that is used. If not found in the environment path, a copy of clang-format bundled with the extension will be used.",
     "c_cpp.configuration.clang_format_style.description": "Coding style, currently supports: Visual Studio, LLVM, Google, Chromium, Mozilla, WebKit. Use \"file\" to load the style from a .clang-format file in the current or parent directory. Use {key: value, ...} to set specific parameters. For example, the \"Visual Studio\" style is similar to: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
     "c_cpp.configuration.clang_format_fallbackStyle.description": "Name of the predefined style used as a fallback in case clang-format is invoked with style \"file\" but the .clang-format file is not found. Possible values are Visual Studio, LLVM, Google, Chromium, Mozilla, WebKit, none, or use {key: value, ...} to set specific parameters. For example, the \"Visual Studio\" style is similar to: { BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -4, NamespaceIndentation: All, FixNamespaceComments: false }",
     "c_cpp.configuration.clang_format_sortIncludes.description": "If set, overrides the include sorting behavior determined by the SortIncludes parameter.",
@@ -188,8 +188,8 @@
     "c_cpp.debuggers.logging.engineLogging.description": "Optional flag to determine whether diagnostic debug engine messages should be logged to the Debug Console. Defaults to false.",
     "c_cpp.debuggers.logging.trace.description": "Optional flag to determine whether diagnostic adapter command tracing should be logged to the Debug Console. Defaults to false.",
     "c_cpp.debuggers.logging.traceResponse.description": "Optional flag to determine whether diagnostic adapter command and response tracing should be logged to the Debug Console. Defaults to false.",
-    "c_cpp.debuggers.cppvsdbg.logging.threadExit.description": "Optional flag to determine whether thread exits messages should be logged to the Debug Console. Default: `false`.",
-    "c_cpp.debuggers.cppvsdbg.logging.processExit.description": "Optional flag to determine whether target process exits messages should be logged to the Debug Console., or debugging is stopped. Default: `true`.",
+    "c_cpp.debuggers.cppvsdbg.logging.threadExit.description": "Optional flag to determine whether thread exit messages should be logged to the Debug Console. Default: false.",
+    "c_cpp.debuggers.cppvsdbg.logging.processExit.description": "Optional flag to determine whether target process exit messages should be logged to the Debug Console. Default: true.",
     "c_cpp.debuggers.text.description": "The debugger command to execute.",
     "c_cpp.debuggers.description.description": "Optional description for the command.",
     "c_cpp.debuggers.ignoreFailures.description": "If true, failures from the command should be ignored. Default value is false.",
@@ -213,7 +213,7 @@
     "c_cpp.debuggers.miDebuggerArgs.description": "Additional arguments for the MI debugger (such as gdb).",
     "c_cpp.debuggers.miDebuggerServerAddress.description": "Network address of the MI Debugger Server to connect to (example: localhost:1234).",
     "c_cpp.debuggers.stopAtEntry.description": "Optional parameter. If true, the debugger should stop at the entrypoint of the target. If processId is passed, has no effect.",
-    "c_cpp.debuggers.debugServerPath.description": "Optional full path to debug server to launch. Defaults to null. It is used in conjunction of either \"miDebugServerAddress\" or your own server with a \"customSetupCommand\" that runs \"-target-select remote <server:port>\"`.",
+    "c_cpp.debuggers.debugServerPath.description": "Optional full path to the debug server to launch. Defaults to null. It is used in conjunction with either \"miDebugServerAddress\" or your own server with a \"customSetupCommand\" that runs \"-target-select remote <server:port>\".",
     "c_cpp.debuggers.debugServerArgs.description": "Optional debug server args. Defaults to null.",
     "c_cpp.debuggers.serverStarted.description": "Optional server-started pattern to look for in the debug server output. Defaults to null.",
     "c_cpp.debuggers.filterStdout.description": "Search stdout stream for server-started pattern and log stdout to debug output. Defaults to true.",
@@ -225,7 +225,7 @@
     "c_cpp.debuggers.cppvsdbg.console.description": "Where to launch the debug target. Defaults to 'internalConsole' if not defined.",
     "c_cpp.debuggers.cppvsdbg.console.internalConsole.description": "Output to the VS Code Debug Console. This doesn't support reading console input (ex:'std::cin' or 'scanf')",
     "c_cpp.debuggers.cppvsdbg.console.integratedTerminal.description": "VS Code's integrated terminal",
-    "c_cpp.debuggers.cppvsdbg.console.externalTerminal.description": "Console applications will be launched in an external terminal window. The window will be reused in relaunch scenarios, and will not automatically disappear when the application exits.",
+    "c_cpp.debuggers.cppvsdbg.console.externalTerminal.description": "Console applications will be launched in an external terminal window. The window will be reused in relaunch scenarios and will not automatically disappear when the application exits.",
     "c_cpp.debuggers.cppvsdbg.console.newExternalWindow.description": "Console applications will be launched in their own external console window which will end when the application stops. Non-console applications will run without a terminal, and stdout/stderr will be ignored.",
     "c_cpp.debuggers.avoidWindowsConsoleRedirection.description": "If true, disables debuggee console redirection that is required for Integrated Terminal support.",
     "c_cpp.debuggers.sourceFileMap.description": "Optional source file mappings passed to the debug engine. Example: '{ \"/original/source/path\":\"/current/source/path\" }'",

From c2a1a88257dc9ac990aa98065a9d0283c37b43db Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Tue, 25 May 2021 13:41:03 -0700
Subject: [PATCH 5/7] Fix the walkthrough for remote targets. (#7582)

* Fix the walkthrough for remote targets.
---
 Extension/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Extension/package.json b/Extension/package.json
index 2b3f09e616..a2b4f8a427 100644
--- a/Extension/package.json
+++ b/Extension/package.json
@@ -59,7 +59,7 @@
             "id": "verify.compiler.mac",
             "title": "Install a C++ compiler",
             "description": "The C++ extension uses the C++ compiler on your system to configure IntelliSense for your project. \n[Check for C++ compilers](command:C_Cpp.CheckForCompiler)",
-            "when": "isMac",
+            "when": "workspacePlatform == mac",
             "media": {
               "altText": "A markdown file with instructions for installing Clang on macOS.",
               "path": "walkthrough/installcompiler/install-clang-macos.md"
@@ -69,7 +69,7 @@
             "id": "verify.compiler.linux",
             "title": "Install a C++ compiler",
             "description": "The C++ extension uses the C++ compiler on your system to configure IntelliSense for your project. \n[Check for C++ compilers](command:C_Cpp.CheckForCompiler)",
-            "when": "isLinux",
+            "when": "workspacePlatform == linux",
             "media": {
               "altText": "A markdown file with instructions for installing GCC on Linux.",
               "path": "walkthrough/installcompiler/install-gcc-linux.md"
@@ -79,7 +79,7 @@
             "id": "verify.compiler.windows",
             "title": "Install a C++ compiler",
             "description": "The C++ extension uses the C++ compiler on your system to configure IntelliSense for your project. \n[Check for C++ compilers](command:C_Cpp.CheckForCompiler)",
-            "when": "isWindows",
+            "when": "workspacePlatform == windows",
             "media": {
               "altText": "A markdown file with instructions for installing MSVC on Windows.",
               "path": "walkthrough/installcompiler/install-compiler-windows.md"
@@ -116,7 +116,7 @@
             "id": "run.project.mac",
             "title": "Run and debug your C++ file",
             "description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-clang-mac#_debug-helloworldcpp)",
-            "when": "isMac",
+            "when": "workspacePlatform == mac",
             "media": {
               "altText": "A markdown file with instructions for starting a debugging session on macOS.",
               "path": "walkthrough/debugconfig/run-and-debug-project-mac.md"
@@ -126,7 +126,7 @@
             "id": "run.project.linux",
             "title": "Run and debug your C++ file",
             "description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-linux#_debug-helloworldcpp)",
-            "when": "isLinux",
+            "when": "workspacePlatform == linux",
             "media": {
               "altText": "A markdown file with instructions for starting a debugging session on Linux.",
               "path": "walkthrough/debugconfig/run-and-debug-project-linux.md"
@@ -136,7 +136,7 @@
             "id": "run.project.windows",
             "title": "Run and debug your C++ file",
             "description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-msvc#_debug-helloworldcpp)",
-            "when": "isWindows",
+            "when": "workspacePlatform == windows",
             "media": {
               "altText": "A markdown file with instructions for starting a debugging session on Windows.",
               "path": "walkthrough/debugconfig/run-and-debug-project-windows.md"

From ee36eab4b684422c64c9f3976264be6db9fc7365 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Tue, 25 May 2021 13:48:32 -0700
Subject: [PATCH 6/7] Delay Insiders prompt until more activations occur.
 (#7587)

* Delay Insiders prompt until 10 activations occur.
---
 Extension/src/LanguageServer/extension.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
index 1dd3746081..9659621e71 100644
--- a/Extension/src/LanguageServer/extension.ts
+++ b/Extension/src/LanguageServer/extension.ts
@@ -603,15 +603,24 @@ async function installVsix(vsixLocation: string): Promise<void> {
 }
 
 async function suggestInsidersChannel(): Promise<void> {
+    if (util.isCodespaces()) {
+        // Do not prompt users of Codespaces to join Insiders.
+        return;
+    }
+
     const suggestInsiders: PersistentState<boolean> = new PersistentState<boolean>("CPP.suggestInsiders", true);
 
     if (!suggestInsiders.Value) {
         return;
     }
-    if (util.isCodespaces()) {
-        // Do not prompt users of Codespaces to join Insiders.
+
+    const suggestInsidersCount: PersistentState<number> = new PersistentState<number>("CPP.suggestInsidersCount", 0);
+
+    if (suggestInsidersCount.Value < 10) {
+        suggestInsidersCount.Value = suggestInsidersCount.Value + 1;
         return;
     }
+
     let buildInfo: BuildInfo | undefined;
     try {
         buildInfo = await getTargetBuildInfo("Insiders", false);

From 4b1be560bb068480b3de303603186526f6131be6 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Tue, 25 May 2021 14:35:27 -0700
Subject: [PATCH 7/7] Update browserslist dependency. (#7589)

---
 Extension/package.json |  3 ++-
 Extension/yarn.lock    | 44 +++++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/Extension/package.json b/Extension/package.json
index a2b4f8a427..71c5efad87 100644
--- a/Extension/package.json
+++ b/Extension/package.json
@@ -2639,7 +2639,8 @@
     "**/mkdirp/minimist": "^0.2.1",
     "yargs-parser": "^15.0.1",
     "y18n": "^5.0.5",
-    "hosted-git-info": "^3.0.8"
+    "hosted-git-info": "^3.0.8", 
+    "browserslist": "^4.16.6"
   },
   "runtimeDependencies": [
     {
diff --git a/Extension/yarn.lock b/Extension/yarn.lock
index 5dfb241e16..a46049f63c 100644
--- a/Extension/yarn.lock
+++ b/Extension/yarn.lock
@@ -1010,16 +1010,16 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.14.5:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
-  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
-  dependencies:
-    caniuse-lite "^1.0.30001181"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.649"
+browserslist@^4.14.5, browserslist@^4.16.6:
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
+  dependencies:
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
-    node-releases "^1.1.70"
+    node-releases "^1.1.71"
 
 btoa-lite@^1.0.0:
   version "1.0.0"
@@ -1089,10 +1089,10 @@ camelcase@^6.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001181:
-  version "1.0.30001204"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz#256c85709a348ec4d175e847a3b515c66e79f2aa"
-  integrity sha512-JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ==
+caniuse-lite@^1.0.30001219:
+  version "1.0.30001230"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
+  integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
 
 chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.2:
   version "2.4.2"
@@ -1299,7 +1299,7 @@ color-support@^1.1.3:
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-colorette@^1.2.1:
+colorette@^1.2.1, colorette@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
@@ -1632,10 +1632,10 @@ editorconfig@^0.15.3:
     semver "^5.6.0"
     sigmund "^1.0.1"
 
-electron-to-chromium@^1.3.649:
-  version "1.3.700"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.700.tgz#a6999a954c698dc7da5e84c369d65432dbe895be"
-  integrity sha512-wQtaxVZzpOeCjW1CGuC5W3bYjE2jglvk076LcTautBOB9UtHztty7wNzjVsndiMcSsdUsdMy5w76w5J1U7OPTQ==
+electron-to-chromium@^1.3.723:
+  version "1.3.738"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz#aec24b091c82acbfabbdcce08076a703941d17ca"
+  integrity sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==
 
 emitter-listener@^1.0.1, emitter-listener@^1.1.1:
   version "1.1.2"
@@ -3857,10 +3857,10 @@ node-fetch@^2.3.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-node-releases@^1.1.70:
-  version "1.1.71"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
-  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+node-releases@^1.1.71:
+  version "1.1.72"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
+  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 normalize-package-data@^2.3.2:
   version "2.5.0"