Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 1eeaac2

Browse files
author
William Li
authored
User facing string update for local tools install/uninstall (#10395)
1 parent 1e73875 commit 1eeaac2

File tree

72 files changed

+429
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+429
-363
lines changed

‎src/dotnet/ToolManifest/LocalizableStrings.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@
151151
<value>Missing 'isRoot' entry.</value>
152152
</data>
153153
<data name="ManifestPackageIdCollision" xml:space="preserve">
154-
<value>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</value>
154+
<value>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</value>
155155
</data>
156156
<data name="CannotFindPackageIdInManifest" xml:space="preserve">
157-
<value>Cannot find any package with package id {0} in manifest file.</value>
157+
<value>Cannot find a package with the package id {0} in the manifest file.</value>
158158
</data>
159159
</root>

‎src/dotnet/ToolManifest/ToolManifestEditor.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ public void Add(
5555

5656
throw new ToolManifestException(string.Format(
5757
LocalizableStrings.ManifestPackageIdCollision,
58-
packageId.ToString(),
59-
nuGetVersion.ToNormalizedString(),
60-
to.Value,
58+
existingPackage.Version.ToNormalizedString(),
6159
existingPackage.PackageId.ToString(),
62-
existingPackage.Version.ToNormalizedString()));
60+
to.Value,
61+
nuGetVersion.ToNormalizedString()));
6362
}
6463

6564
deserializedManifest.Tools.Add(

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.cs.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="cs" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.de.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="de" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.es.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="es" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.fr.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="fr" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.it.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="it" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.ja.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="ja" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.ko.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="ko" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.pl.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="pl" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.pt-BR.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="pt-BR" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.ru.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="ru" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.tr.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="tr" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.zh-Hans.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

‎src/dotnet/ToolManifest/xlf/LocalizableStrings.zh-Hant.xlf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../LocalizableStrings.resx">
44
<body>
55
<trans-unit id="CannotFindPackageIdInManifest">
6-
<source>Cannot find any package with package id {0} in manifest file.</source>
7-
<target state="new">Cannot find any package with package id {0} in manifest file.</target>
6+
<source>Cannot find a package with the package id {0} in the manifest file.</source>
7+
<target state="new">Cannot find a package with the package id {0} in the manifest file.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="ManifestPackageIdCollision">
11-
<source>Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</source>
12-
<target state="new">Cannot add package {0} version {1} to manifest file {2}. Package {3} version {4} exists.</target>
11+
<source>Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</source>
12+
<target state="new">Cannot add package. Manifest file already contains version {0} of the package {1}. Uninstall/install or edit manifest file {2} to specify the new version {3}.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="VersionIsInvalid">

0 commit comments

Comments
 (0)