I can't fix that error, but I received a email about that translation,
though with a different message, don't really know what it means, I
never used Git.
Weblate could not merge upstream changes while updating the repository.
First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Arabic)
Using index info to reconstruct a base tree...
M po/mediawriter_ar.po
Falling back to patching base and 3-way merge...
Auto-merging po/mediawriter_ar.po
CONFLICT (content): Merge conflict in po/mediawriter_ar.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Arabic)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
On 5/23/22 18:57, Jan Grulich wrote:
> Hi,
>
> Can someone please look into this?
>
> Thank you.
>
> Regards,
> Jan
>
> ---------- Forwarded message ---------
> Od: *Yuri Chornoivan* <noreply@weblate.org>
> Date: po 23. 5. 2022 v 18:21
> Subject: [Fedora Weblate] Chyba v repozitáři na
> fedora-media-writer/MediaWriter
> To: <jgrulich@redhat.com>
>
>
> Chyba při sloučení repozitáře
>
> Fedora Weblate <https://translate.fedoraproject.org> /
> fedora-media-writer
> <https://translate.fedoraproject.org/projects/fedora-media-writer/> /
> MediaWriter
> <https://translate.fedoraproject.org/projects/fedora-media-writer/mediawriter/>
>
>
>
> Chybová zpráva
>
> Auto-merging po/mediawriter_ar.po
> CONFLICT (content): Merge conflict in po/mediawriter_ar.po
> Automatic merge failed; fix conflicts and then commit the result.
> (1)
>
>
> Stav repozitáře
>
> On branch main
> Your branch and 'origin/main' have diverged,
> and have 2 and 3 different commits each, respectively.
> (use "git pull" to merge the remote branch into yours)
>
> You have unmerged paths.
> (fix conflicts and run "git commit")
> (use "git merge --abort" to abort the merge)
>
> Unmerged paths:
> (use "git add <file>..." to mark resolution)
>
> both modified: po/mediawriter_ar.po
>
> no changes added to commit (use "git add" and/or "git commit -a")
>
>
> Typický postup pro vyřešení konfliktů
>
> 1. Zapsat všechny změny ve Weblate a zamkněte součást pro překlady.
> |wlc commit; wlc lock|
> 2. Přidejte repozitář exportovaný Weblate jako vzdálený.
> |git remote add weblate
> https://translate.fedoraproject.org/git/fedora-media-writer/mediawriter/
> ; git remote update weblate|
> 3. Slučte změny Weblate a vyřešte jakékoliv konflikty.
> |git merge weblate/main|
> 4. Odešlete změny do vzdáleného repozitáře.
> |git push origin main|
> 5. Weblate by teď měl mít přístup k opravenému repozitáři a můžete ho
> odemknout.
> |wlc pull ; wlc unlock|
>
> V často kladených dotazech naleznete návod na vyřešení této situace.
> <https://docs.weblate.org/en/weblate-4.12.2/faq.html#merge>
>
>
> Informace o součásti
>
> Jazyky 39
> <https://translate.fedoraproject.org/projects/fedora-media-writer/mediawriter/>
>
> Všechny řetězce 5 733
> Přeložené řetězce 3 679 64 %
> Nepřeložené řetězce 1 108 19 %
> Nedokončených řetězců 2 054 35 %
> Řetězce označené pro úpravu 946 16 %
>
> Zobrazit
> <https://translate.fedoraproject.org/projects/fedora-media-writer/mediawriter/>
>
>
>
> Weblate, svobodný systém pro průběžnou lokalizaci. <https://weblate.org/>
>
> ▸ Nastavení upozornění
> <https://translate.fedoraproject.org/accounts/profile/#notifications>
>
> ▸ Vypnout toto upozornění
> <https://translate.fedoraproject.org/accounts/unsubscribe/?i=3947:1ntAnv:89SFKdE24u7-6nDLAKqbcehmTjQZocuOdtKg4cXIwAc>
>
>
> Vytvořeno 23. května 2022 16:21
>
>
> _______________________________________________
> trans mailing list -- trans@lists.fedoraproject.org
> To unsubscribe send an email to trans-leave@lists.fedoraproject.org
> 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/trans@lists.fedoraproject.org
> Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
_______________________________________________
trans mailing list -- trans@lists.fedoraproject.org
To unsubscribe send an email to trans-leave@lists.fedoraproject.org
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/trans@lists.fedoraproject.org
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
No comments:
Post a Comment