Re: Fwd: Translation in Webplate is not available
Thanks for notifying. I see following problems: |git@github.com:openSUSE/software-o-o.git| remote: error: GH006: Protected branch update failed for refs/heads/master. I cannot fix it. It has to be fixed by the GitHub project admin. |git@github.com:openSUSE/www.opensuse.org.git| ERROR: Permission to openSUSE/www.opensuse.org.git denied to opensuse-i18n. I cannot fix it. It has to be fixed by the GitHub project admin. |git@github.com:yast/yast-translations.git| Auto-merging po/qt/fr.po CONFLICT (content): Merge conflict in po/qt/fr.po Auto-merging po/qt/ja.po CONFLICT (content): Merge conflict in po/qt/ja.po Auto-merging po/qt/nl.po CONFLICT (content): Merge conflict in po/qt/nl.po Automatic merge failed; fix conflicts and then commit the result. (1) Why it happens? This is most probably a divergence caused by a race condition. Even if both servers react quickly, there is a minute race window or so. If both GitHub and Weblate change its repositories in the same time, and both change the same file in the same place, a conflict happens. Git is not able to fix it (yet), as it does not implement a smart three way merge of po files. Admin has to do it semi-manually. I did a merge now: https://github.com/yast/yast-translations/commit/7bec1367d0620a7c271c6cdb1ad... The Weblate immediately auto-responded: Merged repository Component was automatically unlocked as alert was fixed. So it should be open for translations again. Dne 24. 06. 22 v 21:34 Christian Boltz napsal(a):
Hi Stanislav,
someone reported a merge conflict on l10n.o.o (see below).
Can you please have a look, and fix it? (Bonus points if you reply to the original mail on factory@ ;-)
---------- Weitergeleitete Nachricht ----------
Betreff: Translation in Webplate is not available Datum: Montag, 20. Juni 2022, 08:12:00 CEST Von: Ivan Vorstanenko <ivanvorstanenko@proton.me> An: factory@lists.opensuse.org
Components of YaST are not available for translation in Weplate. There are errors to merge repositories.
Link : https://l10n.opensuse.org/projects/yast-installation/master/
Can you tell me, why this happen?
-------------------------------------------------------------
Regards,
Christian Boltz
-- Best Regards / S pozdravem, Stanislav Brabec software developer --------------------------------------------------------------------- SUSE LINUX, s. r. o. e-mail: sbrabec@suse.com Křižíkova 148/34 (Corso IIa) tel: +420 284 084 060 186 00 Praha 8-Karlín fax: +420 284 084 001 Czech Republic http://www.suse.cz/ PGP: 830B 40D5 9E05 35D8 5E27 6FA3 717C 209F A04F CD76
Hello, Am Sonntag, 26. Juni 2022, 23:45:44 CEST schrieb Stanislav Brabec:
|git@github.com:openSUSE/software-o-o.git|
remote: error: GH006: Protected branch update failed for refs/heads/master.
I cannot fix it. It has to be fixed by the GitHub project admin.
Making master a "protected branch" makes sense, but the side effect is that weblate also can't push to master anymore. Possible options: - change the weblate config to do pull requests instead of pushing to master - ask the software-o.o maintainers to un-protect the branch, or to give the opensuse-i18n user some special permissions [1]. For this, I'd recommend to open a ticket on github.
|git@github.com:openSUSE/www.opensuse.org.git|
ERROR: Permission to openSUSE/www.opensuse.org.git denied to opensuse-i18n.
I cannot fix it. It has to be fixed by the GitHub project admin.
This one is interesting[tm] - I tried to add the opensuse-i18n user, but get an error saying that the user is blocked. Except that it isn't, as far that I can tell from the project settings. No idea what's going on here. Anyway, this repo is one of the possible future www.o.o repos (we also have www-o-o), therefore not being able to translate it isn't a serious problem right now. (For the records: the current www.o.o lives in the landing-page repo.)
|git@github.com:yast/yast-translations.git| ... I did a merge now:
Thanks! Regards, Christian Boltz [1] https://docs.weblate.org/en/latest/admin/continuous.html#protected-branches might be an option -- We need to make sure that the direction we're going and the decisions we're taking are made by people who will suffer the consequences of them. [Henne Vogelsang in opensuse-project]
participants (2)
-
Christian Boltz -
Stanislav Brabec