diff options
author | Kirill Osenkov <github@osenkov.com> | 2017-11-11 21:59:05 +0300 |
---|---|---|
committer | Kirill Osenkov <github@osenkov.com> | 2017-11-11 21:59:05 +0300 |
commit | c455ef714533a2359179c24402b26169e0699c78 (patch) | |
tree | 7c3b6b23e2bc131f3d1044b3033495ba75f0cf74 /src | |
parent | 772a5db245c52ac2f5ee7e704ab6f8b44929ee58 (diff) |
Fixup resource strings.
Diffstat (limited to 'src')
7 files changed, 85 insertions, 18 deletions
diff --git a/src/Core/Impl/ContentType/Strings.Designer.cs b/src/Core/Impl/ContentType/Strings.Designer.cs index 736d04f..9572258 100644 --- a/src/Core/Impl/ContentType/Strings.Designer.cs +++ b/src/Core/Impl/ContentType/Strings.Designer.cs @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.Utilities.Implementation { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { @@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.Utilities.Implementation { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.CoreUtilityImplementation.ContentType.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Text.Implementation.Core.Impl.ContentType.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; @@ -115,7 +115,7 @@ namespace Microsoft.VisualStudio.Utilities.Implementation { } /// <summary> - /// Looks up a localized string similar to The content type {0} cannot be used as base for content type {1} because it would create a derivation cycle.. + /// Looks up a localized string similar to The content type {0} leads to a cycle in its base types.. /// </summary> internal static string ContentTypeRegistry_CausesCycles { get { diff --git a/src/Microsoft.VisualStudio.Text.Implementation.csproj b/src/Microsoft.VisualStudio.Text.Implementation.csproj index d50b133..7b8cb0c 100644 --- a/src/Microsoft.VisualStudio.Text.Implementation.csproj +++ b/src/Microsoft.VisualStudio.Text.Implementation.csproj @@ -24,7 +24,73 @@ <PackageProjectUrl>https://github.com/Microsoft/vs-editor-api</PackageProjectUrl> <RepositoryUrl>https://github.com/Microsoft/vs-editor-api</RepositoryUrl> </PropertyGroup> - + + <ItemGroup> + <Compile Update="Core\Impl\ContentType\Strings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Strings.resx</DependentUpon> + </Compile> + <Compile Update="Text\Impl\TextModel\Strings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Strings.resx</DependentUpon> + </Compile> + <Compile Update="Text\Impl\TextBufferUndoManager\Strings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Strings.resx</DependentUpon> + </Compile> + <Compile Update="Text\Impl\ClassificationType\Strings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Strings.resx</DependentUpon> + </Compile> + <Compile Update="Text\Impl\EditorPrimitives\Strings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Strings.resx</DependentUpon> + </Compile> + <Compile Update="Text\Impl\EditorOperations\Strings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Strings.resx</DependentUpon> + </Compile> + </ItemGroup> + + <ItemGroup> + <EmbeddedResource Update="Core\Impl\ContentType\Strings.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Strings.Designer.cs</LastGenOutput> + <CustomToolNamespace>Microsoft.VisualStudio.Utilities.Implementation</CustomToolNamespace> + </EmbeddedResource> + <EmbeddedResource Update="Text\Impl\TextModel\Strings.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Strings.Designer.cs</LastGenOutput> + <CustomToolNamespace>Microsoft.VisualStudio.Text.Implementation</CustomToolNamespace> + </EmbeddedResource> + <EmbeddedResource Update="Text\Impl\ClassificationType\Strings.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Strings.Designer.cs</LastGenOutput> + <CustomToolNamespace>Microsoft.VisualStudio.Text.Classification.Implementation.LookUp</CustomToolNamespace> + </EmbeddedResource> + <EmbeddedResource Update="Text\Impl\TextBufferUndoManager\Strings.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Strings.Designer.cs</LastGenOutput> + <CustomToolNamespace>Microsoft.VisualStudio.Text.BufferUndoManager.Implementation</CustomToolNamespace> + </EmbeddedResource> + <EmbeddedResource Update="Text\Impl\EditorPrimitives\Strings.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Strings.Designer.cs</LastGenOutput> + <CustomToolNamespace>Microsoft.VisualStudio.Text.EditorPrimitives.Implementation</CustomToolNamespace> + </EmbeddedResource> + <EmbeddedResource Update="Text\Impl\EditorOperations\Strings.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Strings.Designer.cs</LastGenOutput> + <CustomToolNamespace>Microsoft.VisualStudio.Text.Operations.Implementation</CustomToolNamespace> + </EmbeddedResource> + </ItemGroup> + <ItemGroup> <Compile Remove="Core\Def\**\*" /> <Compile Remove="Text\Def\Text*\**\*" /> diff --git a/src/Text/Impl/ClassificationType/Strings.Designer.cs b/src/Text/Impl/ClassificationType/Strings.Designer.cs index 7ecc53b..68a63ab 100644 --- a/src/Text/Impl/ClassificationType/Strings.Designer.cs +++ b/src/Text/Impl/ClassificationType/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.1434 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.Text.Classification.Implementation.LookUp { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { @@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.Text.Classification.Implementation.LookUp { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Logic.Text.Classification.LookUp.Implementation.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Text.Implementation.Text.Impl.ClassificationType.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Text/Impl/EditorOperations/Strings.Designer.cs b/src/Text/Impl/EditorOperations/Strings.Designer.cs index a0b6e5d..71c4a07 100644 --- a/src/Text/Impl/EditorOperations/Strings.Designer.cs +++ b/src/Text/Impl/EditorOperations/Strings.Designer.cs @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.Text.Operations.Implementation { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { @@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.Text.Operations.Implementation { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.UI.Text.EditorOperations.Implementation.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Text.Implementation.Text.Impl.EditorOperations.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Text/Impl/EditorPrimitives/Strings.Designer.cs b/src/Text/Impl/EditorPrimitives/Strings.Designer.cs index 20bf087..7f44945 100644 --- a/src/Text/Impl/EditorPrimitives/Strings.Designer.cs +++ b/src/Text/Impl/EditorPrimitives/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.1434 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.Text.EditorPrimitives.Implementation { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { @@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.Text.EditorPrimitives.Implementation { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.UI.Text.EditorPrimitives.Implementation.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Text.Implementation.Text.Impl.EditorPrimitives.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Text/Impl/TextBufferUndoManager/Strings.Designer.cs b/src/Text/Impl/TextBufferUndoManager/Strings.Designer.cs index 75dcf7e..5d442b7 100644 --- a/src/Text/Impl/TextBufferUndoManager/Strings.Designer.cs +++ b/src/Text/Impl/TextBufferUndoManager/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.1426 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.Text.BufferUndoManager.Implementation { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { @@ -39,7 +39,8 @@ namespace Microsoft.VisualStudio.Text.BufferUndoManager.Implementation { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Logic.Text.BufferUndoManager.Implementation.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Text.Implementation.Text.Impl.TextBufferUndoManager.String" + + "s", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Text/Impl/TextModel/Strings.Designer.cs b/src/Text/Impl/TextModel/Strings.Designer.cs index 47ec6fd..7768ccf 100644 --- a/src/Text/Impl/TextModel/Strings.Designer.cs +++ b/src/Text/Impl/TextModel/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:4.0.30319.17462 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.Text.Implementation { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Strings { @@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.Text.Implementation { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Text.Implementation.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.Text.Implementation.Text.Impl.TextModel.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; |