Re: Fedora Media Writer translations merge conflict
Rafael Fontenelle <[email protected]> Tue, 10 Sep 2024 12:43:03 -0300
| Newsgroups | gmane.linux.redhat.internationalization |
|---|---|
| Message-ID | <CAFPa+Sk20Dx5X3TJm2Jz_D3i9G2wC8ZS0a96sH0SNqfwkm_TUw@mail.gmail.com> |
--===============4598242382513417931== Content-Type: multipart/alternative; boundary="00000000000030a33c0621c5bbd4" --00000000000030a33c0621c5bbd4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, >From Weblate interface, I tried updating from the upstream repository and also pushing changes to it, without success. You have access to both Weblate project and the upstream repository, so it seems it needs your action. The error: ---- Rebasing (1/14) Auto-merging po/mediawriter_fi.po CONFLICT (content): Merge conflict in po/mediawriter_fi.po error: could not apply 4b52fa0... Translated using Weblate (Finnish) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b52fa0... Translated using Weblate (Finnish) (1) ---- Weblate recommends some steps to fix the issue (which requires access to the upstream repository): https://translate.fedoraproject.org/projects/fedora-media-writer/mediawrite= r/#alerts Please try to follow these instructions and let us know if any questions arise. Best regards, Rafael Em ter., 10 de set. de 2024 08:38, Jan Grulich <[email protected]> escreveu: > Hi, > > This seems to be the case again. May I please ask for a fix for the merge > conflict? > > Thank you. > > Regards, > Jan > > > =C4=8Dt 14. 9. 2023 v 9:06 odes=C3=ADlatel Jan Grulich <[email protected]= om> napsal: > >> Thank you for fixing it! >> >> Regards, >> Jan >> >> =C4=8Dt 14. 9. 2023 v 8:54 odes=C3=ADlatel Rafael Fontenelle <rafaelff@g= nome.org> >> napsal: >> >>> Hi, >>> >>> Just for the record, I closed the issue #645 because alerts are now gon= e >>> and the translation update PR #646 was open. >>> >>> Cheers, >>> Rafael >>> >>> On Thu, Sep 14, 2023 at 2:44=E2=80=AFAM Jan Grulich <[email protected]= m> wrote: >>> >>>> Hi, >>>> >>>> Can someone please look at >>>> https://github.com/FedoraQt/MediaWriter/issues/645?? The repository >>>> for Fedora Media Writer cannot now merge changes as there is a conflic= t. >>>> >>>> Thank you. >>>> >>>> Regards, >>>> Jan Grulich >>>> >>>> _______________________________________________ >>>> trans mailing list -- [email protected] >>>> To unsubscribe send an email to [email protected] >>>> Fedora Code of Conduct: >>>> https://docs.fedoraproject.org/en-US/project/code-of-conduct/ >>>> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guideline= s >>>> List Archives: >>>> https://lists.fedoraproject.org/archives/list/[email protected]= t.org >>>> Do not reply to spam, report it: >>>> https://pagure.io/fedora-infrastructure/new_issue >>>> >>> _______________________________________________ >>> trans mailing list -- [email protected] >>> To unsubscribe send an email to [email protected] >>> Fedora Code of Conduct: >>> https://docs.fedoraproject.org/en-US/project/code-of-conduct/ >>> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines >>> List Archives: >>> https://lists.fedoraproject.org/archives/list/[email protected]= .org >>> Do not reply to spam, report it: >>> https://pagure.io/fedora-infrastructure/new_issue >>> >> >> >> > -- > _______________________________________________ > trans mailing list -- [email protected] > To unsubscribe send an email to [email protected] > Fedora Code of Conduct: > https://docs.fedoraproject.org/en-US/project/code-of-conduct/ > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines > List Archives: > https://lists.fedoraproject.org/archives/list/[email protected]= rg > Do not reply to spam, report it: > https://pagure.io/fedora-infrastructure/new_issue > --00000000000030a33c0621c5bbd4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto"><div>Hi,</div><div dir=3D"auto"><br></div><div dir=3D"aut= o">From Weblate interface, I tried updating from the upstream repository an= d also pushing changes to it, without success.</div><div dir=3D"auto"><br><= /div><div dir=3D"auto">You have access to both Weblate project and the upst= ream repository, so it seems it needs your action.</div><div dir=3D"auto"><= br></div><div dir=3D"auto">The error:</div><div dir=3D"auto"><br></div><div= dir=3D"auto">----</div><div dir=3D"auto">Rebasing (1/14)</div><div dir=3D"= auto">Auto-merging po/mediawriter_fi.po</div><div dir=3D"auto">CONFLICT (co= ntent): Merge conflict in po/mediawriter_fi.po</div><div dir=3D"auto">error= : could not apply 4b52fa0... Translated using Weblate (Finnish)</div><div d= ir=3D"auto">hint: Resolve all conflicts manually, mark them as resolved wit= h</div><div dir=3D"auto">hint: "git add/rm <conflicted_files>&qu= ot;, then run "git rebase --continue".</div><div dir=3D"auto">hin= t: You can instead skip this commit: run "git rebase --skip".</di= v><div dir=3D"auto">hint: To abort and get back to the state before "g= it rebase", run "git rebase --abort".</div><div dir=3D"auto"= >Could not apply 4b52fa0... Translated using Weblate (Finnish)</div><div di= r=3D"auto">=C2=A0(1)</div><div dir=3D"auto">----</div><div dir=3D"auto"><br= ></div><div dir=3D"auto">Weblate recommends some steps to fix the issue (wh= ich requires access to the upstream repository):</div><div dir=3D"auto"><a = href=3D"https://translate.fedoraproject.org/projects/fedora-media-writer/me= diawriter/#alerts">https://translate.fedoraproject.org/projects/fedora-medi= a-writer/mediawriter/#alerts</a></div><div dir=3D"auto"><br></div><div dir= =3D"auto">Please try to follow these instructions and let us know if any qu= estions arise.=C2=A0</div><div dir=3D"auto"><br></div><div dir=3D"auto">Bes= t regards,</div><div dir=3D"auto">Rafael<br><br><div class=3D"gmail_quote" = dir=3D"auto"><div dir=3D"ltr" class=3D"gmail_attr">Em ter., 10 de set. de 2= 024 08:38, Jan Grulich <<a href=3D"mailto:[email protected]">jgrulich@= redhat.com</a>> escreveu:<br></div><blockquote class=3D"gmail_quote" sty= le=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div d= ir=3D"ltr"><div dir=3D"ltr">Hi,<div><br></div><div>This seems to be the cas= e again. May I please ask for a fix for the merge conflict?</div><div><br><= /div><div>Thank you.</div><div><br></div><div>Regards,</div><div>Jan</div><= div><br></div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class= =3D"gmail_attr">=C4=8Dt 14. 9. 2023 v=C2=A09:06 odes=C3=ADlatel Jan Grulich= <<a href=3D"mailto:[email protected]" target=3D"_blank" rel=3D"norefe= rrer">[email protected]</a>> napsal:<br></div><blockquote class=3D"gma= il_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,2= 04,204);padding-left:1ex"><div dir=3D"ltr"><div dir=3D"ltr"></div>Thank you= for fixing it!<div><br></div><div>Regards,</div><div>Jan</div><div><br><di= v class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">=C4=8Dt 14. 9= . 2023 v=C2=A08:54 odes=C3=ADlatel Rafael Fontenelle <<a href=3D"mailto:= [email protected]" target=3D"_blank" rel=3D"noreferrer">[email protected]= </a>> napsal:<br></div><blockquote class=3D"gmail_quote" style=3D"margin= :0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"= ><div dir=3D"ltr"><div>Hi,</div><div><br></div><div>Just for the record, I = closed the issue #645 because alerts are now gone and the translation updat= e PR #646 was open.</div><div><br></div><div>Cheers,</div><div>Rafael<br></= div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_at= tr">On Thu, Sep 14, 2023 at 2:44=E2=80=AFAM Jan Grulich <<a href=3D"mail= to:[email protected]" target=3D"_blank" rel=3D"noreferrer">jgrulich@redha= t.com</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"ma= rgin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:= 1ex"><div dir=3D"ltr">Hi,<div><br></div><div>Can someone please look at=C2= =A0<a href=3D"https://github.com/FedoraQt/MediaWriter/issues/645?" target= =3D"_blank" rel=3D"noreferrer">https://github.com/FedoraQt/MediaWriter/issu= es/645?</a>? The repository for Fedora Media Writer cannot now merge change= s as there is a conflict.</div><div><br></div><div>Thank you.</div><div><br= ></div><div>Regards,</div><div>Jan Grulich<br clear=3D"all"><div><br></div>= </div></div> _______________________________________________<br> trans mailing list -- <a href=3D"mailto:[email protected]" targ= et=3D"_blank" rel=3D"noreferrer">[email protected]</a><br> To unsubscribe send an email to <a href=3D"mailto:[email protected]= roject.org" target=3D"_blank" rel=3D"noreferrer">[email protected]= oject.org</a><br> Fedora Code of Conduct: <a href=3D"https://docs.fedoraproject.org/en-US/pro= ject/code-of-conduct/" rel=3D"noreferrer noreferrer" target=3D"_blank">http= s://docs.fedoraproject.org/en-US/project/code-of-conduct/</a><br> List Guidelines: <a href=3D"https://fedoraproject.org/wiki/Mailing_list_gui= delines" rel=3D"noreferrer noreferrer" target=3D"_blank">https://fedoraproj= ect.org/wiki/Mailing_list_guidelines</a><br> List Archives: <a href=3D"https://lists.fedoraproject.org/archives/list/tra= [email protected]" rel=3D"noreferrer noreferrer" target=3D"_blank"= >https://lists.fedoraproject.org/archives/list/[email protected]= g</a><br> Do not reply to spam, report it: <a href=3D"https://pagure.io/fedora-infras= tructure/new_issue" rel=3D"noreferrer noreferrer" target=3D"_blank">https:/= /pagure.io/fedora-infrastructure/new_issue</a><br> </blockquote></div> _______________________________________________<br> trans mailing list -- <a href=3D"mailto:[email protected]" targ= et=3D"_blank" rel=3D"noreferrer">[email protected]</a><br> To unsubscribe send an email to <a href=3D"mailto:[email protected]= roject.org" target=3D"_blank" rel=3D"noreferrer">[email protected]= oject.org</a><br> Fedora Code of Conduct: <a href=3D"https://docs.fedoraproject.org/en-US/pro= ject/code-of-conduct/" rel=3D"noreferrer noreferrer" target=3D"_blank">http= s://docs.fedoraproject.org/en-US/project/code-of-conduct/</a><br> List Guidelines: <a href=3D"https://fedoraproject.org/wiki/Mailing_list_gui= delines" rel=3D"noreferrer noreferrer" target=3D"_blank">https://fedoraproj= ect.org/wiki/Mailing_list_guidelines</a><br> List Archives: <a href=3D"https://lists.fedoraproject.org/archives/list/tra= [email protected]" rel=3D"noreferrer noreferrer" target=3D"_blank"= >https://lists.fedoraproject.org/archives/list/[email protected]= g</a><br> Do not reply to spam, report it: <a href=3D"https://pagure.io/fedora-infras= tructure/new_issue" rel=3D"noreferrer noreferrer" target=3D"_blank">https:/= /pagure.io/fedora-infrastructure/new_issue</a><br> </blockquote></div><br clear=3D"all"><div><br></div></div></div> </blockquote></div><div><br></div></div> -- <br> _______________________________________________<br> trans mailing list -- <a href=3D"mailto:[email protected]" targ= et=3D"_blank" rel=3D"noreferrer">[email protected]</a><br> To unsubscribe send an email to <a href=3D"mailto:[email protected]= roject.org" target=3D"_blank" rel=3D"noreferrer">[email protected]= oject.org</a><br> Fedora Code of Conduct: <a href=3D"https://docs.fedoraproject.org/en-US/pro= ject/code-of-conduct/" rel=3D"noreferrer noreferrer" target=3D"_blank">http= s://docs.fedoraproject.org/en-US/project/code-of-conduct/</a><br> List Guidelines: <a href=3D"https://fedoraproject.org/wiki/Mailing_list_gui= delines" rel=3D"noreferrer noreferrer" target=3D"_blank">https://fedoraproj= ect.org/wiki/Mailing_list_guidelines</a><br> List Archives: <a href=3D"https://lists.fedoraproject.org/archives/list/tra= [email protected]" rel=3D"noreferrer noreferrer" target=3D"_blank"= >https://lists.fedoraproject.org/archives/list/[email protected]= g</a><br> Do not reply to spam, report it: <a href=3D"https://pagure.io/fedora-infras= tructure/new_issue" rel=3D"noreferrer noreferrer" target=3D"_blank">https:/= /pagure.io/fedora-infrastructure/new_issue</a><br> </blockquote></div></div></div> --00000000000030a33c0621c5bbd4-- --===============4598242382513417931== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline LS0gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCnRyYW5z IG1haWxpbmcgbGlzdCAtLSB0cmFuc0BsaXN0cy5mZWRvcmFwcm9qZWN0Lm9yZwpUbyB1bnN1YnNj cmliZSBzZW5kIGFuIGVtYWlsIHRvIHRyYW5zLWxlYXZlQGxpc3RzLmZlZG9yYXByb2plY3Qub3Jn CkZlZG9yYSBDb2RlIG9mIENvbmR1Y3Q6IGh0dHBzOi8vZG9jcy5mZWRvcmFwcm9qZWN0Lm9yZy9l bi1VUy9wcm9qZWN0L2NvZGUtb2YtY29uZHVjdC8KTGlzdCBHdWlkZWxpbmVzOiBodHRwczovL2Zl ZG9yYXByb2plY3Qub3JnL3dpa2kvTWFpbGluZ19saXN0X2d1aWRlbGluZXMKTGlzdCBBcmNoaXZl czogaHR0cHM6Ly9saXN0cy5mZWRvcmFwcm9qZWN0Lm9yZy9hcmNoaXZlcy9saXN0L3RyYW5zQGxp c3RzLmZlZG9yYXByb2plY3Qub3JnCkRvIG5vdCByZXBseSB0byBzcGFtLCByZXBvcnQgaXQ6IGh0 dHBzOi8vcGFndXJlLmlvL2ZlZG9yYS1pbmZyYXN0cnVjdHVyZS9uZXdfaXNzdWUK --===============4598242382513417931==--