Skip to content

Commit 59e336c

Browse files
edvilmeedvilme
committed
Update translations and fix merge issues
1 parent b411556 commit 59e336c

15 files changed

+502
-2
lines changed

‎src/Cli/dotnet/CliStrings.resx

+241
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,247 @@ The default is 'false.' However, when targeting .NET 7 or lower, the default is
543543
<data name="UnrecognizedCommandOrArgument" xml:space="preserve">
544544
<value>Unrecognized command or argument '{0}'</value>
545545
</data>
546+
<data name="AmbiguousCommandName" xml:space="preserve">
547+
<value>Ambiguous command name: {0}</value>
548+
</data>
549+
<data name="AttemptingToCreateCommandSpec" xml:space="preserve">
550+
<value>{0}: attempting to create commandspec</value>
551+
</data>
552+
<data name="AttemptingToFindCommand" xml:space="preserve">
553+
<value>{0}: attempting to find command {1} in {2}</value>
554+
</data>
555+
<data name="AttemptingToResolve" xml:space="preserve">
556+
<value>{0}: attempting to resolve {1}</value>
557+
</data>
558+
<data name="AttemptingToResolveCommandSpec" xml:space="preserve">
559+
<value>{0}: Attempting to resolve command spec from tool {1}</value>
560+
</data>
561+
<data name="BuildOutputPathDoesNotExist" xml:space="preserve">
562+
<value>outputpathresolver: {0} does not exist</value>
563+
</data>
564+
<data name="CannotFindAManifestFile" xml:space="preserve">
565+
<value>Cannot find a manifest file.
566+
For a list of locations searched, specify the "-d" option before the tool name.</value>
567+
</data>
568+
<data name="CannotFindPackageIdInManifest" xml:space="preserve">
569+
<value>Cannot find a package with the package id {0} in the manifest file.</value>
570+
</data>
571+
<data name="CommandAssembliesNotFound" xml:space="preserve">
572+
<value>The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`</value>
573+
</data>
574+
<data name="CommandSpecIsNull" xml:space="preserve">
575+
<value>{0}: commandSpec is null.</value>
576+
</data>
577+
<data name="CouldNotFindToolRuntimeConfigFile" xml:space="preserve">
578+
<value>{0}: Could not find runtimeconfig.json file for tool {1}</value>
579+
</data>
580+
<data name="DepsJsonGeneratorProjectNotSet" xml:space="preserve">
581+
<value>Unable to find deps.json generator project.</value>
582+
</data>
583+
<data name="DidNotFindAMatchingProject" xml:space="preserve">
584+
<value>{0}: Did not find a matching project {1}.</value>
585+
</data>
586+
<data name="DidNotFindProject" xml:space="preserve">
587+
<value>{0}: ProjectFactory did not find Project.</value>
588+
</data>
589+
<data name="DoesNotExist" xml:space="preserve">
590+
<value>{0}: {1} does not exist</value>
591+
</data>
592+
<data name="ExpectDepsJsonAt" xml:space="preserve">
593+
<value>{0}: expect deps.json at: {1}</value>
594+
</data>
595+
<data name="FailedToFindCommandPath" xml:space="preserve">
596+
<value>{0}: failed to find commandPath {1}</value>
597+
</data>
598+
<data name="FailedToFindSourceUnderPackageSourceMapping" xml:space="preserve">
599+
<value>Package Source Mapping is enabled, but no source found under the specified package ID: {0}. See the documentation for Package Source Mapping at https://aka.ms/nuget-package-source-mapping for more details.</value>
600+
</data>
601+
<data name="FailedToFindToolAssembly" xml:space="preserve">
602+
<value>{0}: failed to find toolAssembly for {1}</value>
603+
</data>
604+
<data name="FailedToLoadNuGetSource" xml:space="preserve">
605+
<value>Failed to load NuGet source {0}</value>
606+
</data>
607+
<data name="FailedToMapSourceUnderPackageSourceMapping" xml:space="preserve">
608+
<value>Package Source Mapping is enabled, but no source mapped under the specified package ID: {0}. See the documentation for Package Source Mapping at https://aka.ms/nuget-package-source-mapping for more details.</value>
609+
</data>
610+
<data name="FailedToReadPidFile" xml:space="preserve">
611+
<value>Failed to read pid file '{0}': {1}</value>
612+
</data>
613+
<data name="FailedToResolveCommandSpec" xml:space="preserve">
614+
<value>{0}: failed to resolve commandspec from library.</value>
615+
</data>
616+
<data name="FailedToValidatePackageSigning" xml:space="preserve">
617+
<value>Failed to validate package signing.
618+
{0}</value>
619+
</data>
620+
<data name="FieldCommandsIsMissing" xml:space="preserve">
621+
<value>Missing 'commands' entry.</value>
622+
</data>
623+
<data name="FoundToolLockFile" xml:space="preserve">
624+
<value>{0}: found tool lockfile at : {1}</value>
625+
</data>
626+
<data name="GeneratingDepsJson" xml:space="preserve">
627+
<value>Generating deps.json at: {0}</value>
628+
</data>
629+
<data name="IgnoringPreferCLIRuntimeFile" xml:space="preserve">
630+
<value>{0}: Ignoring prefercliruntime file as the tool target framework ({1}) has a different major version than the current CLI runtime ({2})</value>
631+
</data>
632+
<data name="InPackage" xml:space="preserve">
633+
<value>In package {0}:
634+
{1}</value>
635+
</data>
636+
<data name="InvalidCommandResolverArguments" xml:space="preserve">
637+
<value>{0}: invalid commandResolverArguments</value>
638+
</data>
639+
<data name="InvalidInputTypeInteger" xml:space="preserve">
640+
<value>{0} should be an integer</value>
641+
</data>
642+
<data name="InvalidManifestFilePrefix" xml:space="preserve">
643+
<value>Invalid manifest file. Path {0}:
644+
{1}</value>
645+
</data>
646+
<data name="InvalidRuntimeIdentifier" xml:space="preserve">
647+
<value>The runtime identifier {0} is invalid. Valid runtime identifiers are: {1}.</value>
648+
</data>
649+
<data name="IsNotFoundInNuGetFeeds" xml:space="preserve">
650+
<value>{0} is not found in NuGet feeds {1}.</value>
651+
</data>
652+
<data name="JsonParsingError" xml:space="preserve">
653+
<value>Json parsing error in file {0} : {1}</value>
654+
</data>
655+
<data name="LibraryNotFoundInLockFile" xml:space="preserve">
656+
<value>{0}: library not found in lock file.</value>
657+
</data>
658+
<data name="ListOfSearched" xml:space="preserve">
659+
<value>The list of searched paths:
660+
{0}</value>
661+
</data>
662+
<data name="LookingForPreferCliRuntimeFile" xml:space="preserve">
663+
<value>{0}: Looking for prefercliruntime file at `{1}`</value>
664+
</data>
665+
<data name="ManifestHasMarkOfTheWeb" xml:space="preserve">
666+
<value>File {0} came from another computer and might be blocked to help protect this computer. For more information, including how to unblock, see https://aka.ms/motw</value>
667+
</data>
668+
<data name="ManifestMissingIsRoot" xml:space="preserve">
669+
<value>Missing 'isRoot' entry.</value>
670+
</data>
671+
<data name="ManifestPackageIdCollision" xml:space="preserve">
672+
<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>
673+
</data>
674+
<data name="ManifestVersion0" xml:space="preserve">
675+
<value>Manifest version 0 is not supported.</value>
676+
</data>
677+
<data name="ManifestVersionHigherThanSupported" xml:space="preserve">
678+
<value>Manifest version is {0}. This manifest may not be supported in this SDK version that can support up to manifest version {1}.</value>
679+
</data>
680+
<data name="MSBuildArgs" xml:space="preserve">
681+
<value>MSBuild arguments: {0}</value>
682+
</data>
683+
<data name="MSBuildExePath" xml:space="preserve">
684+
<value>{0}: MSBUILD_EXE_PATH = {1}</value>
685+
</data>
686+
<data name="MSBuildProjectPath" xml:space="preserve">
687+
<value>{0}: MSBuild project path = {1}</value>
688+
</data>
689+
<data name="MSBuildServer" xml:space="preserve">
690+
<value>MSBuild server</value>
691+
</data>
692+
<data name="MultipleProjectFilesFound" xml:space="preserve">
693+
<value>Specify which project file to use because this '{0}' contains more than one project file.</value>
694+
</data>
695+
<data name="MultipleSamePackageId" xml:space="preserve">
696+
<value>More than one entry exists for package(s): {0}.</value>
697+
</data>
698+
<data name="NeedRunToolRestore" xml:space="preserve">
699+
<value>Run "dotnet tool restore" to make the "{0}" command available.</value>
700+
</data>
701+
<data name="NonRetriableNugetSearchFailure" xml:space="preserve">
702+
<value>Failed to search. NuGet Search API response detail:
703+
RequestUrl: {0}. ReasonPhrase: {1}. StatusCode: {2}.</value>
704+
</data>
705+
<data name="NuGetPackageShouldNotBeSigned" xml:space="preserve">
706+
<value>Skipping signature verification for NuGet package "{0}" because it comes from a source that does not require signature validation.</value>
707+
</data>
708+
<data name="NuGetPackageSignatureVerificationSkipped" xml:space="preserve">
709+
<value>Skipping NuGet package signature verification.</value>
710+
</data>
711+
<data name="NuGetPackagesRoot" xml:space="preserve">
712+
<value>{0}: nuget packages root:
713+
{1}</value>
714+
</data>
715+
<data name="OnlyOneProjectAllowed" xml:space="preserve">
716+
<value>Only one project can be specified at a time using the -p option.</value>
717+
<comment>{Locked="-p"}</comment>
718+
</data>
719+
<data name="PackageVersionDescriptionDefault" xml:space="preserve">
720+
<value>A version of {0} of package {1}</value>
721+
</data>
722+
<data name="PackageVersionDescriptionForExactVersionMatch" xml:space="preserve">
723+
<value>Version {0} of package {1}</value>
724+
</data>
725+
<data name="PackageVersionDescriptionForVersionWithLowerAndUpperBounds" xml:space="preserve">
726+
<value>A version between {0} and {1} of package {2}</value>
727+
</data>
728+
<data name="PackageVersionDescriptionForVersionWithLowerBound" xml:space="preserve">
729+
<value>A version higher than {0} of package {1}</value>
730+
</data>
731+
<data name="PackageVersionDescriptionForVersionWithUpperBound" xml:space="preserve">
732+
<value>A version less than {0} of package {1}</value>
733+
</data>
734+
<data name="RazorServer" xml:space="preserve">
735+
<value>Razor build server</value>
736+
</data>
737+
<data name="ResolvingCommandSpec" xml:space="preserve">
738+
<value>{0}: resolving commandspec from {1} Tool Libraries.</value>
739+
</data>
740+
<data name="RetriableNugetSearchFailure" xml:space="preserve">
741+
<value>Failed to search. Retry later may resolve the issue. NuGet Search API response detail:
742+
RequestUrl: {0}. ReasonPhrase: {1}. StatusCode: {2}.</value>
743+
</data>
744+
<data name="SDKDiagnosticsCommandDefinition" xml:space="preserve">
745+
<value>Enable diagnostic output.</value>
746+
</data>
747+
<data name="ShutdownCommandFailed" xml:space="preserve">
748+
<value>The shutdown command failed: {0}</value>
749+
</data>
750+
<data name="ToolLibraryFound" xml:space="preserve">
751+
<value>{0}: tool library found {1}</value>
752+
</data>
753+
<data name="ToolMissingVersion" xml:space="preserve">
754+
<value>Missing 'version' entry.</value>
755+
</data>
756+
<data name="UnableToCheckCertificateChainPolicy" xml:space="preserve">
757+
<value>The requested certificate chain policy could not be checked: {0}</value>
758+
</data>
759+
<data name="UnableToDeleteTemporaryDepsJson" xml:space="preserve">
760+
<value>unable to delete temporary deps.json file: {0}</value>
761+
</data>
762+
<data name="UnableToGenerateDepsJson" xml:space="preserve">
763+
<value>Unable to generate deps.json, it may have been already generated. You can specify the "-d" option option after "dotnet" for diagnostic output (for example, "dotnet -d &lt;toolname&gt;": {0}</value>
764+
</data>
765+
<data name="UnableToLocateDotnetMultiplexer" xml:space="preserve">
766+
<value>Unable to locate dotnet multiplexer</value>
767+
</data>
768+
<data name="UnexpectedTypeInJson" xml:space="preserve">
769+
<value>Expected a {0} for property '{1}'.</value>
770+
</data>
771+
<data name="VBCSCompilerServer" xml:space="preserve">
772+
<value>VB/C# compiler server</value>
773+
</data>
774+
<data name="VerifyingNuGetPackageSignature" xml:space="preserve">
775+
<value>Verified that the NuGet package "{0}" has a valid signature.</value>
776+
</data>
777+
<data name="VersionForPackageCouldNotBeResolved" xml:space="preserve">
778+
<value>Version for package `{0}` could not be resolved.</value>
779+
</data>
780+
<data name="VersionIsInvalid" xml:space="preserve">
781+
<value>Version {0} is invalid.</value>
782+
</data>
783+
<data name="WorkloadIntegrityCheckError" xml:space="preserve">
784+
<value>An issue was encountered verifying workloads. For more information, run "dotnet workload update".</value>
785+
<comment>{Locked="dotnet workload update"}</comment>
786+
</data>
546787
<data name="PackageIdentityArgumentDescription" xml:space="preserve">
547788
<value>Package reference in the form of package identifier, for example 'Newtonsoft.Json', or package identifier and version separated by '@', for example 'Newtonsoft.Json@13.0.3'.</value>
548789
</data>

‎src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Microsoft.DotNet.Cli.Commands.Tool.Common;
77
using Microsoft.DotNet.Cli.Commands.Tool.Search;
88
using Microsoft.DotNet.Cli.Extensions;
9-
using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings;
109
using NuGet.Packaging.Core;
1110

1211
namespace Microsoft.DotNet.Cli.Commands.Tool.Install;
@@ -90,7 +89,7 @@ public static CliCommand GetCommand()
9089

9190
private static CliCommand ConstructCommand()
9291
{
93-
CliCommand command = new("install", LocalizableStrings.CommandDescription);
92+
CliCommand command = new("install", CliCommandStrings.ToolInstallCommandDescription);
9493
command.Arguments.Add(PackageIdentityArgument);
9594

9695
AddCommandOptions(command);

‎src/Cli/dotnet/xlf/CliStrings.cs.xlf

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

‎src/Cli/dotnet/xlf/CliStrings.de.xlf

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

‎src/Cli/dotnet/xlf/CliStrings.es.xlf

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

0 commit comments

Comments
 (0)