This repository was archived by the owner on Nov 15, 2025. It is now read-only.
Merged
Conversation
This reverts commit 512e006.
stlnb
reviewed
Nov 11, 2020
| <trans-unit id="Settings.ResetToDefaults" translate="yes" xml:space="preserve"> | ||
| <source>Reset all settings to defaults</source> | ||
| <target state="new">Сбросить все настройки до значений по умолчанию</target> | ||
Contributor
There was a problem hiding this comment.
@Samuel12321 I think we have our faulty line.
It was missing a closing </trans-unit> tag
It was also due to the merge commit you did before merging in #194
Seems like GitHub conflict manager is dumb 🤷
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
turns out this was the source of our XLF bug. Still don't know why