Skip to content

Commit

Permalink
Merge pull request #3072 from Microsoft/dev
Browse files Browse the repository at this point in the history
Sync from dev
  • Loading branch information
sibille authored Apr 2, 2019
2 parents 27368e8 + dde59c3 commit 326a81a
Show file tree
Hide file tree
Showing 436 changed files with 1,400 additions and 1,366 deletions.
2 changes: 1 addition & 1 deletion _build/CodeSign_ExtractFilesToSign.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
param
(
[Parameter(Mandatory=$true)]
[string]$vsixFilePath = "c:\vsix\Microsoft.Templates.2017.vsix",
[string]$vsixFilePath = "c:\vsix\Microsoft.Templates.vsix",
[Parameter(Mandatory=$true)]
[string]$outputPath = "c:\vsix\c"
)
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.cs-cz.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\cs-CZ/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\cs-CZ/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\cs-CZ/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\cs-CZ/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\cs-CZ/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\cs-CZ/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\cs-CZ/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\cs-CZ/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.de-de.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\de-DE/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\de-DE/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\de-DE/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\de-DE/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\de-DE/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\de-DE/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\de-DE/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\de-DE/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.en-us.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\en-US/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\en-US/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\en-US/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\en-US/Microsoft.Templates.resources.dll" />
</job>
</SignConfigXML>
2 changes: 1 addition & 1 deletion _build/assemblies.es-es.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\es-ES/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\es-ES/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\es-ES/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\es-ES/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\es-ES/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\es-ES/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\es-ES/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\es-ES/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.fr-fr.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\fr-FR/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\fr-FR/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\fr-FR/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\fr-FR/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\fr-FR/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\fr-FR/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\fr-FR/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\fr-FR/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.it-it.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\it-IT/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\it-IT/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\it-IT/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\it-IT/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\it-IT/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\it-IT/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\it-IT/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\it-IT/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.ja-jp.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\ja-JP/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\ja-JP/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ja-JP/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\ja-JP/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ja-JP/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\ja-JP/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ja-JP/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\ja-JP/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.ko-kr.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\ko-KR/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\ko-KR/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ko-KR/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\ko-KR/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ko-KR/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\ko-KR/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ko-KR/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\ko-KR/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.pl-pl.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\pl-PL/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\pl-PL/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\pl-PL/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\pl-PL/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\pl-PL/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\pl-PL/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\pl-PL/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\pl-PL/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.pt-br.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\pt-BR/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\pt-BR/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\pt-BR/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\pt-BR/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\pt-BR/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\pt-BR/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\pt-BR/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\pt-BR/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.ru-ru.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\ru-RU/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\ru-RU/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ru-RU/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\ru-RU/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ru-RU/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\ru-RU/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\ru-RU/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\ru-RU/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
7 changes: 4 additions & 3 deletions _build/assemblies.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\Microsoft.Templates.2017.dll" signType="400" dest="__OUTPATHROOT__\Microsoft.Templates.2017.dll" />
<file src="__INPATHROOT__\itemsToSign\Microsoft.Templates.dll" signType="400" dest="__OUTPATHROOT__\Microsoft.Templates.dll" />
<file src="__INPATHROOT__\itemsToSign\Microsoft.Templates.Core.dll" signType="400" dest="__OUTPATHROOT__\Microsoft.Templates.Core.dll" />
<file src="__INPATHROOT__\itemsToSign\Microsoft.Templates.UI.dll" signType="400" dest="__OUTPATHROOT__\Microsoft.Templates.UI.dll" />
<file src="__INPATHROOT__\itemsToSign\Newtonsoft.Json.dll" signType="400" dest="__OUTPATHROOT__\Newtonsoft.Json.dll" />
<file src="__INPATHROOT__\itemsToSign\Interop.CERTENROLLLib.dll" signType="400" dest="__OUTPATHROOT__\Interop.CERTENROLLLib.dll" />
<file src="__INPATHROOT__\itemsToSign\Microsoft.Templates.Extensions.2017.dll" signType="400" dest="__OUTPATHROOT__\Microsoft.Templates.Extensions.2017.dll" />
<file src="__INPATHROOT__\itemsToSign\Microsoft.Templates.Extensions.2019.dll" signType="400" dest="__OUTPATHROOT__\Microsoft.Templates.Extensions.2019.dll" />
<file src="__INPATHROOT__\itemsToSign\Microsoft.Templates.Utilities.dll" signType="400" dest="__OUTPATHROOT__\Microsoft.Templates.Utilities.dll" />
<file src="__INPATHROOT__\itemsToSign\WriteableBitmapEx.Wpf.dll" signType="400" dest="__OUTPATHROOT__\WriteableBitmapEx.Wpf.dll" />
</job>
</SignConfigXML>
2 changes: 1 addition & 1 deletion _build/assemblies.tr-tr.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\tr-TR/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\tr-TR/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\tr-TR/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\tr-TR/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\tr-TR/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\tr-TR/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\tr-TR/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\tr-TR/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.zh-cn.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\zh-CN/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-CN/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\zh-CN/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-CN/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\zh-CN/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-CN/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\zh-CN/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-CN/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/assemblies.zh-tw.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\itemsToSign\zh-TW/Microsoft.Templates.2017.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-TW/Microsoft.Templates.2017.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\zh-TW/Microsoft.Templates.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-TW/Microsoft.Templates.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\zh-TW/Microsoft.Templates.Core.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-TW/Microsoft.Templates.Core.resources.dll" />
<file src="__INPATHROOT__\itemsToSign\zh-TW/Microsoft.Templates.UI.resources.dll" signType="400" dest="__OUTPATHROOT__\zh-TW/Microsoft.Templates.UI.resources.dll" />
</job>
Expand Down
2 changes: 1 addition & 1 deletion _build/vsix.signconfig.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<job platform="" configuration="release" dest="" jobname="WindowsTemplateStudio Sign" approvers="crutkas;ralarcon">
<file src="__INPATHROOT__\vsix\Microsoft.Templates.2017.vsix" signType="100040160" dest="__OUTPATHROOT__\vsix\Microsoft.Templates.2017.vsix" />
<file src="__INPATHROOT__\vsix\Microsoft.Templates.vsix" signType="100040160" dest="__OUTPATHROOT__\vsix\Microsoft.Templates.vsix" />
</job>
</SignConfigXML>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Microsoft.Templates.Core.PostActions.Catalog
{
public class CopyFilesToProjectPostAction : PostAction<TempGenerationResult>
{
private List<string> excludeFromOpeningExtensions = new List<string>() { ".png", ".jpg", ".bmp", ".ico" };
private List<string> excludeFromOpeningExtensions = new List<string>() { ".png", ".jpg", ".bmp", ".ico", ".csproj", ".vbproj" };

public CopyFilesToProjectPostAction(TempGenerationResult config)
: base(config)
Expand Down
6 changes: 3 additions & 3 deletions code/src/Core/Resources/StringRes.cs-CZ.resx
Original file line number Diff line number Diff line change
Expand Up @@ -500,15 +500,15 @@ Nemohly být integrovány následující změny: {2}
<value>Nelze rozpoznat platformu.</value>
</data>
<data name="ErrorTitleInvalidProjectName" xml:space="preserve">
<value>Invalid project name</value>
<value>Neplatný název projektu</value>
<comment>Message box title for project invalid names.</comment>
</data>
<data name="ErrorProjectReservedName" xml:space="preserve">
<value>"{0}" is a reserved name. Please choose a different name and try again.</value>
<value>{0} je vyhrazený název. Zvolte jiný název a zopakujte akci.</value>
<comment>Message box text for project reserved names.</comment>
</data>
<data name="ErrorProjectStartsWith" xml:space="preserve">
<value>"{0}" is not a valid name. Project name can't start with "{1}".</value>
<value>{0} není platný název. Název projektu nemůže začínat na {1}.</value>
<comment>Message box text for project name can not start with.</comment>
</data>
<data name="FailedMergePostActionMismatchedEncoding" xml:space="preserve">
Expand Down
8 changes: 4 additions & 4 deletions code/src/Core/Resources/StringRes.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -493,22 +493,22 @@ Die folgenden Änderungen konnten nicht integriert werden: {2}
<comment>Generating exception message. {0}: Template. {1}: Name, {2}: Reason</comment>
</data>
<data name="ErrorTrackTelemetryException" xml:space="preserve">
<value>Ausnahme für die Nachverfolgungstelemetrie während der Generierung.</value>
<value>Ausnahmenachverfolgungstelemetrie während der Generierung.</value>
<comment>Exception tracking telemetry during generation.</comment>
</data>
<data name="ErrorUnableResolvePlatform" xml:space="preserve">
<value>Plattform kann nicht aufgelöst werden.</value>
</data>
<data name="ErrorTitleInvalidProjectName" xml:space="preserve">
<value>Invalid project name</value>
<value>Ungültiger Projektname</value>
<comment>Message box title for project invalid names.</comment>
</data>
<data name="ErrorProjectReservedName" xml:space="preserve">
<value>"{0}" is a reserved name. Please choose a different name and try again.</value>
<value>{0}“ ist ein reservierter Name. Wählen Sie einen anderen Namen aus und wiederholen Sie den Vorgang.</value>
<comment>Message box text for project reserved names.</comment>
</data>
<data name="ErrorProjectStartsWith" xml:space="preserve">
<value>"{0}" is not a valid name. Project name can't start with "{1}".</value>
<value>{0}“ ist kein gültiger Name. Ein Projektname darf nicht mit „{1}“ beginnen.</value>
<comment>Message box text for project name can not start with.</comment>
</data>
<data name="FailedMergePostActionMismatchedEncoding" xml:space="preserve">
Expand Down
6 changes: 3 additions & 3 deletions code/src/Core/Resources/StringRes.es-ES.resx
Original file line number Diff line number Diff line change
Expand Up @@ -500,15 +500,15 @@ No se pueden integrar las modificaciones siguientes: {2}
<value>No se puede resolver la plataforma.</value>
</data>
<data name="ErrorTitleInvalidProjectName" xml:space="preserve">
<value>Invalid project name</value>
<value>Nombre de proyecto no válido</value>
<comment>Message box title for project invalid names.</comment>
</data>
<data name="ErrorProjectReservedName" xml:space="preserve">
<value>"{0}" is a reserved name. Please choose a different name and try again.</value>
<value>"{0}" es un nombre reservado. Selecciona un nombre diferente y vuelve a intentarlo.</value>
<comment>Message box text for project reserved names.</comment>
</data>
<data name="ErrorProjectStartsWith" xml:space="preserve">
<value>"{0}" is not a valid name. Project name can't start with "{1}".</value>
<value>"{0}" no es un nombre válido. El nombre del proyecto no puede empezar por "{1}".</value>
<comment>Message box text for project name can not start with.</comment>
</data>
<data name="FailedMergePostActionMismatchedEncoding" xml:space="preserve">
Expand Down
6 changes: 3 additions & 3 deletions code/src/Core/Resources/StringRes.fr-FR.resx
Original file line number Diff line number Diff line change
Expand Up @@ -500,15 +500,15 @@ Les modifications suivantes n'ont pu être intégrées : {2}
<value>Impossible de résoudre la plateforme.</value>
</data>
<data name="ErrorTitleInvalidProjectName" xml:space="preserve">
<value>Invalid project name</value>
<value>Nom de projet incorrect</value>
<comment>Message box title for project invalid names.</comment>
</data>
<data name="ErrorProjectReservedName" xml:space="preserve">
<value>"{0}" is a reserved name. Please choose a different name and try again.</value>
<value>« {0} » est un nom réservé. Choisissez un autre nom et réessayez.</value>
<comment>Message box text for project reserved names.</comment>
</data>
<data name="ErrorProjectStartsWith" xml:space="preserve">
<value>"{0}" is not a valid name. Project name can't start with "{1}".</value>
<value>« {0} » n'est pas un nom correct. Le nom de projet ne peut pas commencer par « {1} ».</value>
<comment>Message box text for project name can not start with.</comment>
</data>
<data name="FailedMergePostActionMismatchedEncoding" xml:space="preserve">
Expand Down
Loading

0 comments on commit 326a81a

Please sign in to comment.