Fix an issue where the message displayed when two files are identical in a 3-way folder comparison is not translated. #1535
Conversation
This file contains 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
… identical in a 3-way folder comparison is not translated. - (Middle and right are identical) - (Left and right are identical) - (Left and middle are identical) The strings defined in Merge.rc have leading spaces, but the strings in DirViewColItems.cpp do not. So add a space to the beginning of the string in DirViewColItems.cpp.
|
Thank you! |
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.
Fix an issue where the following message displayed when two files are identical in a 3-way folder comparison is not translated.
The strings defined in Merge.rc have leading spaces, but the strings in DirViewColItems.cpp have no leading spaces and are not translated.
This PR fixes this issue by adding a leading space to the string in DirViewColItems.cpp.