search

mquinson / po4a-website

Source code of https://po4a.org/
GNU General Public License v2.0
5 stars 5 forks source link

Fix conflict #14

Closed gemmaro closed 1 year ago

gemmaro commented 1 year ago

Hello,

This pull request fixes a conflict between this GitHub repository and Weblate (po4a/Website) by merging the latter into the former.

Currently there is a conflict and warnings appear on Weblate components, which seemed to be my cause (While some changes were being made to this repository, I was almost simultaneously making a trivial change to Weblate). It should now be possible to merge Weblate from this repository and this conflict should be resolved.

Reference: Weblate 4.17 documentation > Frequently Asked Questions > How to fix merge conflicts in translations?

Thank you, gemmaro.

mquinson commented 1 year ago

Thanks a lot. Since I do not speak japanese, this was a difficult conflict to fix for me.

And thanks for the translations, also!

gemmaro commented 1 year ago

Sorry to bother you again. Maybe an administrative action is required to unlock the po4a/Website component (I thought the Weblate instance would unlock automatically, but it looks like it doesn't).

mquinson commented 1 year ago

I think it's fixed now. Indeed, I had to unlock it manually (and fix a remaining conflict in the file metadata).

Please tell me if the issue remains.

gemmaro commented 1 year ago

Thank you so much! It works well.