Re: Fedora Media Writer translations merge conflict

--===============3721221786295617151==
Content-Type: multipart/alternative; boundary="00000000000014adbd0621c24f86"

--00000000000014adbd0621c24f86
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

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]=
> napsal:

> Thank you for fixing it!
>
> Regards,
> Jan
>
> =C4=8Dt 14. 9. 2023 v 8:54 odes=C3=ADlatel Rafael Fontenelle <rafaelff@gn=
ome.org>
> napsal:
>
>> Hi,
>>
>> Just for the record, I closed the issue #645 because alerts are now gone
>> 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]=
> 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 conflict.
>>>
>>> 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_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].=
org
>> Do not reply to spam, report it:
>> https://pagure.io/fedora-infrastructure/new_issue
>>
>
>
>

--00000000000014adbd0621c24f86
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div dir=3D"ltr">Hi,<div><br></div><div>This seems to be t=
he case 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" c=
lass=3D"gmail_attr">=C4=8Dt 14. 9. 2023 v=C2=A09:06 odes=C3=ADlatel Jan Gru=
lich &lt;<a href=3D"mailto:[email protected]">[email protected]</a>&gt;=
 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 di=
r=3D"ltr"><div dir=3D"ltr"></div>Thank you for fixing it!<div><br></div><di=
v>Regards,</div><div>Jan</div><div><br><div class=3D"gmail_quote"><div dir=
=3D"ltr" class=3D"gmail_attr">=C4=8Dt 14. 9. 2023 v=C2=A08:54 odes=C3=ADlat=
el Rafael Fontenelle &lt;<a href=3D"mailto:[email protected]" target=3D"_b=
lank">[email protected]</a>&gt; napsal:<br></div><blockquote class=3D"gmai=
l_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,20=
4,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 a=
nd the translation update 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_attr">On Thu, Sep 14, 2023 at 2:44=E2=80=AFAM Jan G=
rulich &lt;<a href=3D"mailto:[email protected]" target=3D"_blank">jgrulic=
[email protected]</a>&gt; wrote:<br></div><blockquote class=3D"gmail_quote" styl=
e=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);paddin=
g-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?" ta=
rget=3D"_blank">https://github.com/FedoraQt/MediaWriter/issues/645?</a>? Th=
e repository for Fedora Media Writer cannot now merge changes as there is a=
 conflict.</div><div><br></div><div>Thank you.</div><div><br></div><div>Reg=
ards,</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">[email protected]</a><br>
To unsubscribe send an email to <a href=3D"mailto:[email protected]=
roject.org" target=3D"_blank">[email protected]</a><br>
Fedora Code of Conduct: <a href=3D"https://docs.fedoraproject.org/en-US/pro=
ject/code-of-conduct/" rel=3D"noreferrer" target=3D"_blank">https://docs.fe=
doraproject.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" target=3D"_blank">https://fedoraproject.org/wik=
i/Mailing_list_guidelines</a><br>
List Archives: <a href=3D"https://lists.fedoraproject.org/archives/list/tra=
[email protected]" rel=3D"noreferrer" target=3D"_blank">https://li=
sts.fedoraproject.org/archives/list/[email protected]</a><br>
Do not reply to spam, report it: <a href=3D"https://pagure.io/fedora-infras=
tructure/new_issue" rel=3D"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">[email protected]</a><br>
To unsubscribe send an email to <a href=3D"mailto:[email protected]=
roject.org" target=3D"_blank">[email protected]</a><br>
Fedora Code of Conduct: <a href=3D"https://docs.fedoraproject.org/en-US/pro=
ject/code-of-conduct/" rel=3D"noreferrer" target=3D"_blank">https://docs.fe=
doraproject.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" target=3D"_blank">https://fedoraproject.org/wik=
i/Mailing_list_guidelines</a><br>
List Archives: <a href=3D"https://lists.fedoraproject.org/archives/list/tra=
[email protected]" rel=3D"noreferrer" target=3D"_blank">https://li=
sts.fedoraproject.org/archives/list/[email protected]</a><br>
Do not reply to spam, report it: <a href=3D"https://pagure.io/fedora-infras=
tructure/new_issue" rel=3D"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>

--00000000000014adbd0621c24f86--


--===============3721221786295617151==
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

--===============3721221786295617151==--