Weblate conflict #1971
Weblate conflict #1971
Conversation
9fdda69 to
4a99c70
Compare
360d01a to
84f0d65
Compare
|
If it is desired to block editing English strings, or letting Weblate end up mutating them, then disable 'Edit base file' in the "Translations" component inside the Translation settings sub-menu for that component. |
|
I noticed some empty @: {}, so just empty stuff that Weblate seems to add. |
|
I'm not familiar with the format here ofc! I mess more with Android, but still, worth looking into |
weblate otherwise will reformat all of these anyway
weblate will otherwise add these anyway, which can cause commit spam
Currently translated at 99.8% (777 of 778 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/
Currently translated at 98.8% (769 of 778 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/pt_BR/
84f0d65 to
e5d939d
Compare
|
@krille-chan can you get a quick look of this? I wanna take advantage of my want to go messing with pt-BR in Weblate |
|
Okay thank you. I'll try it out :) |
I modified a few English strings, simple things, but this seems to have triggered Weblate to completely go and force-write every translation file, in the end, a conflict happened, and it was hard to analyze what was changed or not.
It seems like at some point, the files got rewritten with a different setup than Weblate usually uses, it doesn't do anything initially, but ends up resulting in things like this sometimes.
There are two commits relevant to the file formatting, fixing indentation and missing newlines, this makes the files the same as Weblate ends up rewriting, so it should prevent this in the future.
Then, the relevant commits were cherry-picked. There were only changes in Estonian and pt-BR. I just proofread pt-BR so a simple reset would be quite sad :D
To merge this, simply merge it (preferably don't squash) and reset the repository in Weblate, and that should work.