Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2806991 #63758
Conversation
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
…: Build ID 2798609
…: Build ID 2798609
github-actions
bot
added
the
area-infrastructure
wtgodbe
added
the
* NO MERGE *
|
Loc pipeline reports 97% localized |
dotnet-bot
changed the title
…: Build ID 2799282
…: Build ID 2799282
dotnet-bot
changed the title
…: Build ID 2800129
dotnet-bot
changed the title
…: Build ID 2800980
|
/backport to release/10.0-rc2 |
|
Started backporting to release/10.0-rc2: https://github.com/dotnet/aspnetcore/actions/runs/17986060607 |
|
@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 128Please backport manually! |
dotnet-bot
changed the title
|
Still at 99% |
dotnet-bot
changed the title
…: Build ID 2802828
…: Build ID 2802828
|
Still 99% |
dotnet-bot
changed the title
dotnet-bot
changed the title
dotnet-bot
changed the title
|
Still at 99% |
dotnet-bot
changed the title
…: Build ID 2805428
dotnet-bot
changed the title
dotnet-bot
changed the title
|
Remaining loc strings are ones that aren't meant to be translated ("Microsoft Corporation"), per @cristianosuzuki77 |
|
/backport to release/10.0 |
|
Started backporting to release/10.0: https://github.com/dotnet/aspnetcore/actions/runs/18204697563 |
|
@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 128Please backport manually! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
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.