-
Notifications
You must be signed in to change notification settings - Fork 260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Translations update from Hosted Weblate #1978
base: master
Are you sure you want to change the base?
Conversation
b8ea3e2
to
8d10f3e
Compare
Currently this PR changes the I would also suggest to update every |
I think that's just because I went through the issues Weblate raised and fixed a bunch of them, if someone else makes a change then it'll be them mentioned there, so that seems to be working as we'd want, isn't it?
It looks like it's possible to do the former in Weblate using an add-on: I'll enable it and see what happens. |
065af51
to
bb73f56
Compare
Yes, it's just that I thought that it wouldn't be ideal if the |
Oh, I understand now. Well, that add-on certainly made a lot of changes. There's a lot of noise from changing line numbers and c++-format tags getting stripped (my guess is that Weblate is using an older version of gettext, it's not a big deal beyond the noise though), and it defaulted to allowing fuzzy matching which has caused some incorrect matches that I've spotted, so I've disabled that. It updates the PO files whenever the POT file in this repo changes, so if that update introduces changes and they trigger a PR back to this repo with those changes then I think that would be fine, but if it's going to hang onto those changes until there is a translation change and then open a PR for those changes together than that'll be more difficult to review. I couldn't see an option to delete old translations from the PO files, so it seems like we'll have to do that manually. |
There is also the option to reset the Weblate repository state to match this repo, so if we make manual changes we can force that reset afterwards - we'd lose the queued up changes I've been making so far, but that's not a big deal (I can redo them as part of the manual changes). I'd like to reset the repo state to test out if PO file sync changes are held back until a translation is made, but I won't do that just yet. |
I updated the PO files and applied the fixes I made in Weblate directly in this repository, and now Weblate has alerted that its repo is locked due to a merge conflict with this repo. The alert displays instructions for resolving the issue, which boils down to adding weblate as another remote to a local clone of this repo, then merging in the weblate changes and pushing them to this repo, and then weblate will stop seeing conflicts. However, that's not what I want to do in this case: I'd rather resolve conflicts by rebasing weblate on top of this repo, but I'm not able to push the rebased branch to the weblate repo. As such, I'm just going to reset the weblate repo to match this one, losing all the changes I've made in Weblate so far (which unfortunately will include what strings are approved, I think). I've also installed the "Customise gettext output" add-on to configure line wrapping to the xgettext default of 77 characters, to hopefully reduce the noise in Weblate's changes. EDIT: Looks like resetting didn't lose the approved strings data after all. |
Just noting that this ties back to #1973. |
49f7694
to
1061174
Compare
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: LOOT/LOOT Translate-URL: https://hosted.weblate.org/projects/loot/loot/
Currently translated at 67.0% (179 of 267 strings) Translation: LOOT/LOOT Translate-URL: https://hosted.weblate.org/projects/loot/loot/es/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: LOOT/LOOT Translate-URL: https://hosted.weblate.org/projects/loot/loot/
8d5891d
to
d217549
Compare
Currently translated at 67.0% (179 of 267 strings) Translation: LOOT/LOOT Translate-URL: https://hosted.weblate.org/projects/loot/loot/es/
Translations update from Hosted Weblate for LOOT/LOOT.
Current translation status: