Skip to content

Commit e18e7f0

Browse files
authored
Renaming resources that has same name and different message than resource in different project (#11505)
1 parent 7e8d5f5 commit e18e7f0

15 files changed

+309
-309
lines changed

src/MSBuild/Resources/Strings.resx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1504,14 +1504,14 @@
15041504
<value>MSBUILD : error MSB1059: Targets could not be printed. {0}</value>
15051505
<comment>{StrBegin="MSBUILD : error MSB1059: "}</comment>
15061506
</data>
1507-
<data name="LoggerCreationError" xml:space="preserve">
1507+
<data name="XMake.LoggerCreationError" xml:space="preserve">
15081508
<value>MSBUILD : error MSB1021: Cannot create an instance of the logger. {0}</value>
15091509
<comment>{StrBegin="MSBUILD : error MSB1021: "}
15101510
UE: This error is shown when a logger cannot be loaded and instantiated from its assembly.
15111511
LOCALIZATION: The prefix "MSBUILD : error MSBxxxx:" should not be localized. {0} contains a message explaining why the
15121512
logger could not be created -- this message comes from the CLR/FX and is localized.</comment>
15131513
</data>
1514-
<data name="LoggerNotFoundError" xml:space="preserve">
1514+
<data name="XMake.LoggerNotFoundError" xml:space="preserve">
15151515
<value>MSBUILD : error MSB1020: The logger was not found. Check the following: 1.) The logger name specified is the same as the name of the logger class. 2.) The logger class is "public" and implements the Microsoft.Build.Framework.ILogger interface. 3.) The path to the logger assembly is correct, or the logger can be loaded using only the assembly name provided.</value>
15161516
<comment>
15171517
{StrBegin="MSBUILD : error MSB1020: "}UE: This message does not need in-line parameters because the exception takes care of displaying the invalid arg.
@@ -1520,7 +1520,7 @@
15201520
LOCALIZATION: The prefix "MSBUILD : error MSBxxxx:" should not be localized.
15211521
</comment>
15221522
</data>
1523-
<data name="ProjectUpgradeNeededToVcxProj" xml:space="preserve">
1523+
<data name="XMake.ProjectUpgradeNeededToVcxProj" xml:space="preserve">
15241524
<value>MSBUILD : error MSB4192: The project file "{0}" is in the ".vcproj" or ".dsp" file format, which MSBuild cannot build directly. Please convert the project by opening it in the Visual Studio IDE or running the conversion tool, or, for ".vcproj", use MSBuild to build the solution file containing the project instead.</value>
15251525
<comment>{StrBegin="MSBUILD : error MSB4192: "} LOC: ".vcproj" and ".dsp" should not be localized</comment>
15261526
</data>

src/MSBuild/Resources/xlf/Strings.cs.xlf

+23-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.de.xlf

+23-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)