Merge pull request #7504 from microsoft/seanmcm/1_4_0_insidersMerge2

1.4.0-insiders merge2
Merge branch 'main' into seanmcm/1_4_0_insidersMerge2
2021-05-10 11:55:49 -07:00 · 2021-05-10 09:54:57 -07:00 · 2021-05-06 19:39:23 -07:00 · 2021-05-06 18:46:06 -07:00 · 2021-05-06 18:41:47 -07:00 · 2021-04-08 15:22:46 -07:00
3 changed files with 3 additions and 2 deletions
@@ -47,7 +47,7 @@
 	"windows.sdk.version": "Wersja zestawu Windows SDK",
 	"windows.sdk.version.description": "Wersja ścieżki dyrektywy include zestawu Windows SDK, która ma być używana w systemie Windows, np. {0}.",
 	"mac.framework.path": "Ścieżka do platformy Mac",
-	"mac.framework.path.description": "Lista ścieżek do użycia przez aparat IntelliSense podczas wyszukiwania dołączonych nagłówków z platform Mac. Obsługiwane tylko w przypadku konfiguracji dla systemu MacOS.",
+	"mac.framework.path.description": "Lista ścieżek do użycia przez aparat IntelliSense podczas wyszukiwania dołączonych nagłówków z platform Mac. Obsługiwane tylko w przypadku konfiguracji dla systemu macOS.",
 	"one.path.per.line": "Jedna ścieżka na wiersz.",
 	"forced.include": "Wymuszone dołączanie",
 	"forced.include.description": "Lista plików, które powinny zostać uwzględnione przed przetworzeniem każdego innego znaku w pliku źródłowym. Pliki są uwzględniane w podanej kolejności.",
@@ -104,6 +104,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CppToo
        const platformInfo: PlatformInformation = await PlatformInformation.GetPlatformInformation();
        const vsixName: string = vsixNameForPlatform(platformInfo);
        const downloadLink: string = localize("download.button", "Go to Download Page");
+
        errMsg = localize("native.binaries.not.supported", "This {0} {1} version of the extension is incompatible with your OS. Please download and install the \"{2}\" version of the extension.", GetOSName(installedPlatformAndArchitecture.platform), installedPlatformAndArchitecture.architecture, vsixName);
        vscode.window.showErrorMessage(errMsg, downloadLink).then(async (selection) => {
            if (selection === downloadLink) {
@@ -6082,4 +6082,4 @@ yauzl@^2.10.0:
 yocto-queue@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
Author	SHA1	Message	Date
Sean McManus	905f8dc216	Merge pull request #7504 from microsoft/seanmcm/1_4_0_insidersMerge2 1.4.0-insiders merge2	2021-05-10 11:55:49 -07:00
Sean McManus	6464f55fcf	Merge branch 'main' into seanmcm/1_4_0_insidersMerge2	2021-05-10 09:54:57 -07:00
Sean McManus	dba4a28d88	Merge pull request #7480 from microsoft/seanmcm/1_4_0_insiders 1.4.0-insiders	2021-05-06 19:39:23 -07:00
Sean McManus	53a3864fdc	Update version.	2021-05-06 18:46:06 -07:00
Sean McManus	0ea25159d4	Merge branch 'main' into seanmcm/1_4_0_insiders	2021-05-06 18:41:47 -07:00
Colen Garoutte-Carson	143207aadb	Merge to insiders (#7320 )	2021-04-08 15:22:46 -07:00
Michelle Matias	0edf6c3ea7	Merge pull request #7304 from microsoft/mimatias/insiders4-2 1.3.0-insiders4 (#2)	2021-04-06 16:39:09 -07:00
Michelle Matias	4e22b6577f	Merge pull request #7302 from microsoft/mimatias/insiders4 1.3.0-insiders4	2021-04-06 11:48:40 -07:00
Michelle Matias	1ab60bc247	Merge branch 'insiders' into mimatias/insiders4	2021-04-06 11:45:09 -07:00
Colen Garoutte-Carson	33eb2f6abe	Add some files missed when merging to Insiders branch (#7271 )	2021-04-01 12:15:23 -07:00
Colen Garoutte-Carson	11262438e3	Merge main into insiders (#7266 )	2021-03-31 19:16:40 -07:00
Colen Garoutte-Carson	673a68d4cc	Merge to insiders (#7236 )	2021-03-25 14:05:32 -07:00
Sean McManus	437d9b333a	Merge pull request #7223 from microsoft/1_3_0_insiders2 1.3.0-insiders2 merge	2021-03-24 12:10:49 -07:00
Sean McManus	0139274856	Change date.	2021-03-24 12:09:28 -07:00
Sean McManus	87cfa702bc	Update changelog.	2021-03-24 06:04:49 -07:00
Sean McManus	013bff267e	Merge branch 'insiders' into 1_3_0_insiders2	2021-03-24 05:53:35 -07:00
Colen Garoutte-Carson	d942d64b7b	Merge main to insiders (#7186 )	2021-03-16 20:56:48 -07:00
Colen Garoutte-Carson	1a2bf6fc4c	Merge main into insiders (#7180 )	2021-03-16 17:44:59 -07:00
Sean McManus	32c1d6bf52	Merge pull request #6997 from microsoft/main Merge for 1.2.2-insiders2	2021-02-18 18:13:59 -08:00
Sean McManus	ebd5314b48	Merge pull request #6986 from microsoft/seanmcm/1_2_2_insiders 1.2.2-insiders	2021-02-17 15:01:04 -08:00
Sean McManus	5c7f551dba	Merge.	2021-02-17 14:57:49 -08:00
Sean McManus	6ccea3878b	Merge pull request #6853 from microsoft/seanmcm/1_2_0_insiders3 1.2.0-insiders3	2021-01-26 18:22:11 -08:00
Sean McManus	e5fd036af9	Update changelog.	2021-01-26 17:40:57 -08:00
Sean McManus	4254419e76	Merge branch 'main' into seanmcm/1_2_0_insiders3	2021-01-26 17:27:51 -08:00
Sean McManus	f9ecc9c6f9	Merge pull request #6820 from microsoft/seanmcm/1_2_0_insiders2 1.2.0-insiders2	2021-01-19 20:26:53 -08:00
Sean McManus	9405f41521	Merge branch 'main' into seanmcm/1_2_0_insiders2	2021-01-19 18:22:49 -08:00
Sean McManus	37cca41225	Merge pull request #6785 from microsoft/seanmcm/1_2_0_insiders_updates 1 2 0 insiders updates	2021-01-14 18:22:43 -08:00
Sean McManus	ed584b23e2	Merge branch 'main' into seanmcm/1_2_0_insiders_updates	2021-01-14 18:21:56 -08:00
Sean McManus	f7cab674a4	Merge branch 'main' into seanmcm/1_2_0_insiders_updates	2021-01-14 17:31:47 -08:00
Sean McManus	42586081fa	Merge pull request #6777 from microsoft/seanmcm/1_2_0_insiders Merge latest changes for 1.2.0-insiders	2021-01-13 18:56:37 -08:00
Sean McManus	c49e51d386	Fix extra space.	2021-01-13 18:53:52 -08:00