[6.1.7 Cherry-pick] [Scheduled Run] Localized resource files from OneLocBuild - #4648
Merged
Merged
Conversation
To resolve, run: git cherry-pick 92eb8b4
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com> Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
benrr101
marked this pull request as ready for review
September 8, 2026 19:42
benrr101
changed the title
Contributor
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
All additions are orphaned satellite-resource entries that cannot be consumed on this release branch.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Cherry-picks a OneLocBuild resource update into release/6.1, adding an access-token validation message across localized resources.
Changes:
- Adds the same resource key to 13 locale files.
- Uses English text for every locale.
- Introduces no corresponding neutral resource or accessor.
File summaries
| File | Description |
|---|---|
| Strings.cs.resx | Adds Czech satellite entry. |
| Strings.de.resx | Adds German satellite entry. |
| Strings.es.resx | Adds Spanish satellite entry. |
| Strings.fr.resx | Adds French satellite entry. |
| Strings.it.resx | Adds Italian satellite entry. |
| Strings.ja.resx | Adds Japanese satellite entry. |
| Strings.ko.resx | Adds Korean satellite entry. |
| Strings.pl.resx | Adds Polish satellite entry. |
| Strings.pt-BR.resx | Adds Brazilian Portuguese satellite entry. |
| Strings.ru.resx | Adds Russian satellite entry. |
| Strings.tr.resx | Adds Turkish satellite entry. |
| Strings.zh-Hans.resx | Adds Simplified Chinese satellite entry. |
| Strings.zh-Hant.resx | Adds Traditional Chinese satellite entry. |
Review details
- Files reviewed: 13/13 changed files
- Comments generated: 13
- Review effort level: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
cheenamalhotra
approved these changes
Sep 8, 2026
benrr101
approved these changes
Sep 8, 2026
paulmedynski
enabled auto-merge (squash)
September 9, 2026 15:07
Contributor
|
/azp run CI-SqlClient-Package |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
paulmedynski
approved these changes
Sep 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of #4645 (92eb8b4) into
release/6.1failed due to merge conflicts.Please resolve manually:
git fetch origin git checkout dev/automation/pr-4645-to-6.1.7 git cherry-pick 92eb8b46b0e70251b3af0c6af3a19a411521dd64 # resolve conflicts git push origin dev/automation/pr-4645-to-6.1.7 --force