.gitattributes

@@ -0,0 +1,3 @@
+# VerifyTests
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
+*.verified.resx text eol=lf working-tree-encoding=UTF-8

Documentation/Topics/Automatic-Translations.md

@@ -2,10 +2,10 @@
 To speed up the localization process you can make use of automated translations.
 
 ### Usage
-Switch to the `Translate` tab to use this feature. 
+Switch to the `Translate` tab to use this feature.
 
 If the translation service needs credentials, enter them in the translation engine configuration. Follow the link to the translation service to learn about the service specifics.
-If you don't want to use a service, uncheck the check box next to the name. 
+If you don't want to use a service, uncheck the check box next to the name.
 
 After selecting source and target language, all entires that have no translation in the target language will be displayed and the translation runs in the background. When the translation is complete, the results can be reviewed or edited before accepting the result.
 
@@ -17,20 +17,38 @@ All results can be reviewed by opening the combo box in the target column. The r
 
 #### Pros
 - Much more context aware
-- Higher quality translations
+- Higher quality translations, especially when fed with at least two different languages when translating to third/fourth/etc languages
 - Ability to use comments to guide the model
 - Better understanding of placeholders (such as {0}), seems to put them in better locations
 
 #### Cons
-- Much slower
+- Most models are slower, or much slower, than the other translation services
 - More expensive (depending on your token cost at Azure)
 
 #### Configuration
 - Add a new Azure OpenAI resource using the portal or CLI.
-- Deploy the "text-davinci-003" (completion based) or "gpt-3.5-turbo" (chat based) model.
+- Model availability may vary depending on e.g. region, check the model availabilty [here](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models#gpt-4-and-gpt-4-turbo-preview-model-availability)
+- Deploy the "gpt-3.5-turbo-instruct" (completion based) or "gpt-3.5-turbo"/"gpt-4-turbo" (chat based) model.
 - Copy the API key, URL to the endpoint and name of the deployment and model into the settings of the translator
 
 #### Addtional Settings
 - You can add a custom prompt to your request to improve the translation quality or behavior, e.g. "preserve the html tags in the results"
-- You can include the comments in your resources in the prompt, to guid the model with some additional hints about the context
+- You can include the comments in your resources in the prompt, to guide the model with additional hints about the context
 
+### Open AI
+
+#### Pros
+- Same az Azure Open AI
+
+#### Cons
+- Same as Azure Open AI but with a different pricing model
+- No batched translation support
+
+#### Configuration
+- Go to [here](https://platform.openai.com/signup) to sign up and get an API key from [here](https://platform.openai.com/api-keys)
+- Copy the API key and a model of your choosing (e.g. "gpt-3.5-turbo"/"gpt-4-turbo") into the settings of the translator
+
+#### Addtional Settings
+- You can add a custom prompt to your request to improve the translation quality or behavior, e.g. "preserve the html tags in the results"
+- You can include the comments in your resources in the prompt, to guide the model with additional hints about the context
+- If you need to use other LLM services compatible with the OpenAI API (such as DeepSeek), you can modify the URL to the corresponding service address (for example: https://api.deepseek.com). Since the internal token counting function supports a limited number of models, you may need to disable token counting (uncheck Max Tokens) to use other models properly.

README.md

@@ -3,6 +3,7 @@
 # ResX Resource Manager 
 [![Build Status](https://dev.azure.com/tom-englert/Open%20Source/_apis/build/status/ResXResourceManager?branchName=master)](https://dev.azure.com/tom-englert/Open%20Source/_build/latest?definitionId=35&branchName=master)
 [![Sponsor](https://img.shields.io/badge/-Sponsor-fafbfc?logo=GitHub%20Sponsors)](https://github.com/sponsors/tom-englert)
+[<img src="https://api.gitsponsors.com/api/badge/img?id=60344691" height="20">](https://api.gitsponsors.com/api/badge/link?p=FvTYDNU2vjlfIiyQ/Xt3lqNu5WSkM2nBDdrkEbFn9pwUyJlQPy8xa2x0whq4DmesGdh2TpAH5F2xZKY5empjmZ3MbhPCdsTkhNkgdI9YKm3KVT0gfaRMVCZOXNBHcgVnOufMOKJY1SZmAswXshqfBg==)
 
 The most popular tool to manage localization of all kind of applications with resx-based resources; one of the highest rated extensions on the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=TomEnglert.ResXManager).
 
@@ -35,7 +36,7 @@ This project is supported by the [.NET Foundation](https://dotnetfoundation.org)
 Can be found in the [Documentation folder](Documentation/Readme.md).
 
 ## Installation
-ResXResourceManager is available as VS2017-2022 extension and as a standalone executable to support VS2015 and older or users without Visual Studio at all.
+ResXResourceManager is available as VS2019-2022 extension and as a standalone executable to support VS2017 and older or users without Visual Studio at all.
 A scripting module is available as well, so you can easily automate resource tasks, e.g. export untranslated string during build.
 
 All versions can be downloaded from the [releases](../../releases) page.

Release notes.md

@@ -1,4 +1,37 @@
-1.80
+1.90
+- Translator configuration can be collapsed.
+- #678: Improve Google Lite translator multi-part response parsing.
+- #682: OpenAI translator endpoint is configurable to support also e.g. local deployments.
+
+1.89
+- Fix #666: Add tests and solution for duplicate target language usage in same directory for xlf files (contributed by Geert van Horrik <geert@catenalogic.com>)
+
+1.88
+- Azure OpenAI translator: Use new tokenizer from Microsoft to support newer gpt4o model (contributed by Joakim Riedel <joakim.riedel@gmail.com>)
+
+1.87
+- Stick with System.Composition.AttributedModel Version="[1.4.1]" for compatibility with older VS versions.
+
+1.86
+- Add OpenAI translator (contributed by Attila Greguss <attila.greguss@netduma.com>)
+
+1.85
+- #639: Support for DeepL glossaries (contributed by Philip Kyburz <ph.kyburz@gmail.com>)
+
+1.84
+- Fix #634: XlfSynchronizer does not generate separate file entries for different resources in the same project
+
+1.83
+- Fix #616: Added GoogleLite endpoint that doesn't halt translation on certain punctuation. 
+- Fix broken upload on VS Marketplace
+
+1.82
+- support newer OpenAI models
+
+1.81
+- Fix #626: ResX Resource Manager does not refresh UI after key removal
+
+1.80
 - Fix #623: Import from Excel with empty cell
 - #624: Consider blanks as changes in Excel import
 

azure-pipelines.yml

@@ -15,7 +15,7 @@ stages:
     - task: UseDotNet@2
       inputs:
         packageType: 'sdk'
-        version: '7.0.400'
+        version: '8.0.201'
 
     - script: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe" -version'
       displayName: 'log msbuild version'
@@ -136,17 +136,29 @@ stages:
     - pwsh: Rename-Item -Path "$(Pipeline.Workspace)\BuildPackages\Publish.clickonce" -NewName Publish.zip
       displayName: 'Rename click-once archive back to .zip'
 
+    # Publish the signed packages
+    - publish: $(Pipeline.Workspace)/BuildPackages
+      displayName: Publish Signed Packages
+      artifact: SignedPackages
+
+- stage: Upload
+  dependsOn: CodeSign
+  jobs:
+  - job: Upload
+    displayName: Upload to VSIX gallery
+    pool:
+      vmImage: windows-latest
+    steps:
+    - download: current
+      artifact: SignedPackages
+      displayName: Download build artifacts
     - task: PowerShell@1
       displayName: 'Publish to vsix-gallery'
       inputs:
         scriptType: inlineScript
         inlineScript: |
           (new-object Net.WebClient).DownloadString("https://raw.github.com/tom-englert/BuildScripts/master/BuildScripts.ps1") | iex
-          Vsix-PublishToGallery "$(Pipeline.Workspace)\BuildPackages\ResXManager.Vsix.vsix"
+          Vsix-PublishToGallery "$(Pipeline.Workspace)\SignedPackages\ResXManager.Vsix.vsix"
       continueOnError: true
 
-    # Publish the signed packages
-    - publish: $(Pipeline.Workspace)/BuildPackages
-      displayName: Publish Signed Packages
-      artifact: SignedPackages
 

src/.editorconfig

@@ -13,6 +13,16 @@ indent_size = 4
 insert_final_newline = true
 charset = utf-8-bom
 
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false
+
 ###############################
 # .NET Coding Conventions     #
 ###############################
@@ -201,3 +211,12 @@ dotnet_diagnostic.CA1860.severity = suggestion
 # CA1861: Avoid constant arrays as arguments
 dotnet_diagnostic.CA1861.severity = suggestion
 
+# IDE0290: Use primary constructor
+dotnet_diagnostic.IDE0290.severity = suggestion
+
+# IDE0305: Collection initializer can be simplified
+dotnet_diagnostic.IDE0305.severity = suggestion
+
+# CA1515: Because an application's API isn't typically referenced from outside the assembly, types can be made internal
+dotnet_diagnostic.CA1515.severity = suggestion
+

src/Directory.Build.props

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>1.81.0.0</Version>
+    <Version>1.90.0.0</Version>
     <Company>tom-englert.de</Company>
     <Product>ResXManager</Product>
     <Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>

src/Directory.Packages.props

@@ -1,25 +1,26 @@
-  <Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AutoProperties.Fody" Version="1.25.0" />
     <PackageVersion Include="DataGridExtensions" Version="2.6.0" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="[2.20.0]" />
     <PackageVersion Include="Community.VisualStudio.Toolkit" Version="[15.0.76.309]" />
-    <PackageVersion Include="Fody" Version="6.8.0" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.11.58" />
+    <PackageVersion Include="Fody" Version="6.9.2" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.74" />
     <PackageVersion Include="ILMerge.Fody" Version="1.24.0" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageVersion Include="Microsoft.DeepDev.TokenizerLib" Version="[1.3.1]" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.ML.Tokenizers" Version="[0.22.0-preview.24378.1]" Justification="VS2019"/>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="[15.0.1]" />
     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="[17.6.2164]" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NSubstitute" Version="5.1.0" />
-    <PackageVersion Include="Nullable.Extended.Analyzer" Version="1.15.6169" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="Nullable.Extended.Analyzer" Version="1.15.6495" />
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="Resourcer.Fody" Version="1.8.1" />
     <PackageVersion Include="System.Composition.AttributedModel" Version="[1.4.1]" />
@@ -29,21 +30,27 @@
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="[6.0.4]" />
     <PackageVersion Include="System.ServiceModel.Primitives" Version="[4.10.2]" />
     <PackageVersion Include="System.ServiceModel.Http" Version="[4.10.2]" />
+    <PackageVersion Include="System.Text.Json" Version="[8.0.5]" Justification="VS2019"/>
     <PackageVersion Include="Throttle.Fody" Version="1.7.0" />
-    <PackageVersion Include="TomsToolbox.Composition" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.Composition.Ninject" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.Essentials" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.ObservableCollections" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.Wpf" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition.Styles" Version="2.13.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.13.0" />
-    <PackageVersion Include="Verify.Xunit" Version="23.1.0" />
+    <PackageVersion Include="TomsToolbox.Composition" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.Composition.Ninject" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.Essentials" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.ObservableCollections" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.Wpf" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition.Styles" Version="2.22.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.22.0" />
+    <PackageVersion Include="Verify.Xunit" Version="28.13.0" />
     <PackageVersion Include="VSIX-SdkProjectAdapter" Version="3.0.0" />
     <PackageVersion Include="WindowsAPICodePack-Shell" Version="1.1.1" />
-    <PackageVersion Include="xunit" Version="2.6.6" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageMitigation Include="Newtonsoft.Json" Version="8.0.3" Justification="VS 2019 requirement" />
+    <PackageMitigation Include="MessagePack" Version="2.2.85" Justification="VS Sdk dependency" />
   </ItemGroup>
 </Project>
 

src/Notice.txt

@@ -14,7 +14,7 @@ License: Apache-2.0
 Data Grid Extensions
 
 Id:      DataGridExtensions
-Version: 2.5.15
+Version: 2.6.0
 Project: https://github.com/dotnet/DataGridExtensions
 License: MIT
 
@@ -41,7 +41,7 @@ License: MIT
 Tokenizer
 
 Id:      Microsoft.DeepDev.TokenizerLib
-Version: 1.3.1
+Version: 1.3.3
 Project: https://github.com/microsoft/Tokenizer/
 License: MIT
 
@@ -151,7 +151,7 @@ License: MIT
 System.ServiceModel.Http
 
 Id:      System.ServiceModel.Http
-Version: 4.10.3
+Version: 4.10.2
 Project: https://github.com/dotnet/wcf
 License: MIT
 
@@ -160,7 +160,7 @@ License: MIT
 System.ServiceModel.Primitives
 
 Id:      System.ServiceModel.Primitives
-Version: 4.10.3
+Version: 4.10.2
 Project: https://github.com/dotnet/wcf
 License: MIT
 
@@ -169,7 +169,7 @@ License: MIT
 Tom's Toolbox Composition - Core Module
 
 Id:      TomsToolbox.Composition
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 
@@ -178,7 +178,7 @@ License: MIT
 Tom's Toolbox Composition - Ninject Module
 
 Id:      TomsToolbox.Composition.Ninject
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 
@@ -187,7 +187,7 @@ License: MIT
 Tom's Toolbox ObservableCollections Module
 
 Id:      TomsToolbox.ObservableCollections
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 
@@ -196,7 +196,7 @@ License: MIT
 Tom's Toolbox WPF Module
 
 Id:      TomsToolbox.Wpf
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 
@@ -205,7 +205,7 @@ License: MIT
 Tom's Toolbox WPF Composition - Core Module
 
 Id:      TomsToolbox.Wpf.Composition
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 
@@ -214,7 +214,7 @@ License: MIT
 Tom's Toolbox WPF Composition - Attributed Model Module
 
 Id:      TomsToolbox.Wpf.Composition.AttributedModel
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 
@@ -223,7 +223,7 @@ License: MIT
 Tom's Toolbox WPF Composition - Styles Module
 
 Id:      TomsToolbox.Wpf.Composition.Styles
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 
@@ -232,7 +232,7 @@ License: MIT
 Tom's Toolbox WPF Styles Module
 
 Id:      TomsToolbox.Wpf.Styles
-Version: 2.10.0
+Version: 2.14.0
 Project: https://github.com/tom-englert/TomsToolbox
 License: MIT
 

src/ResXManager.Infrastructure/ResXManager.Infrastructure.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="HtmlAgilityPack" PrivateAssets="all" />
     <PackageReference Include="ILMerge.Fody" PrivateAssets="all" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
-    <PackageReference Include="Newtonsoft.Json" VersionOverride="[9.0.1]" />
+    <PackageReference Include="Newtonsoft.Json" VersionOverride="[9.0.1]" Justification="VS2019" />
     <PackageReference Include="PropertyChanged.Fody" PrivateAssets="all" />
     <PackageReference Include="TomsToolbox.Composition" />
   </ItemGroup>