Skip to content

Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2806991#63758

Merged
wtgodbe merged 9 commits intomainfrom
locfiles/8ba7a731-1006-4224-aa24-697cbf420337
Oct 2, 2025
Merged

Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2806991#63758
wtgodbe merged 9 commits intomainfrom
locfiles/8ba7a731-1006-4224-aa24-697cbf420337

Conversation

@dotnet-bot
Copy link
Copy Markdown
Contributor

@dotnet-bot dotnet-bot commented Sep 21, 2025

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

@dotnet-bot dotnet-bot requested review from a team and wtgodbe as code owners September 21, 2025 18:12
@github-actions github-actions bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 21, 2025
@wtgodbe wtgodbe added the * NO MERGE * Do not merge this PR as long as this label is present. label Sep 22, 2025
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Sep 22, 2025

Loc pipeline reports 97% localized

@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2798609 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2799282 Sep 22, 2025
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Sep 22, 2025

https://dev.azure.com/dnceng/internal/_build/results?buildId=2799282&view=logs&j=6aa31087-d1b8-5ee1-af29-f0fe63353381&t=f5f0ecb8-e09a-5b29-99cb-311e048f2c1c

99%, not yet

@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2799282 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2800129 Sep 23, 2025
@build-analysis build-analysis bot mentioned this pull request Sep 23, 2025
Open
@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2800129 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2800980 Sep 24, 2025
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Sep 24, 2025

/backport to release/10.0-rc2

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 24, 2025

Started backporting to release/10.0-rc2: https://github.com/dotnet/aspnetcore/actions/runs/17986060607

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 24, 2025

@wtgodbe backporting to "release/10.0-rc2" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2798609
Using index info to reconstruct a base tree...
M	src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl
Falling back to patching base and 3-way merge...
Auto-merging src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl
Auto-merging src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2798609
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@wtgodbe wtgodbe mentioned this pull request Sep 24, 2025
Merged
@build-analysis build-analysis bot mentioned this pull request Sep 24, 2025
Open
@wtgodbe wtgodbe mentioned this pull request Sep 25, 2025
Merged
@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2800980 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2801853 Sep 25, 2025
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Sep 25, 2025

Still at 99%

@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2801853 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2802828 Sep 26, 2025
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Sep 26, 2025

Still 99%

@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2802828 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2803453 Sep 27, 2025
@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2803453 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2803930 Sep 28, 2025
@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2803930 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2804612 Sep 29, 2025
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Sep 29, 2025

Still at 99%

@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2804612 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2805428 Sep 30, 2025
This was referenced Sep 30, 2025
Open
Open
@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2805428 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2806269 Oct 1, 2025
@wtgodbe wtgodbe mentioned this pull request Oct 2, 2025
Merged
@dotnet-bot dotnet-bot changed the title Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2806269 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2806991 Oct 2, 2025
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Oct 2, 2025

Remaining loc strings are ones that aren't meant to be translated ("Microsoft Corporation"), per @cristianosuzuki77

@wtgodbe wtgodbe merged commit fadd05e into main Oct 2, 2025
26 of 30 checks passed
@wtgodbe wtgodbe deleted the locfiles/8ba7a731-1006-4224-aa24-697cbf420337 branch October 2, 2025 20:22
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Oct 2, 2025

/backport to release/10.0

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Oct 2, 2025

Started backporting to release/10.0: https://github.com/dotnet/aspnetcore/actions/runs/18204697563

@dotnet-policy-service dotnet-policy-service bot added this to the 11.0-preview1 milestone Oct 2, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Oct 2, 2025

@wtgodbe backporting to "release/10.0" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2798609
Using index info to reconstruct a base tree...
M	src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl
M	src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl
Falling back to patching base and 3-way merge...
Auto-merging src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
CONFLICT (content): Merge conflict in src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2798609
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@wtgodbe wtgodbe mentioned this pull request Oct 2, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wtgodbe wtgodbe Awaiting requested review from wtgodbe wtgodbe is a code owner

Assignees

No one assigned

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework * NO MERGE * Do not merge this PR as long as this label is present.

Projects

None yet

Milestone

11.0-preview1

Development

Successfully merging this pull request may close these issues.

2 participants

@dotnet-bot @wtgodbe