Fwd: [Fedora Weblate] New alert on fedora-media-writer/MediaWriter

Hi,

I would like to kindly ask someone to look into this issue.

Thank you.

Regards,
Jan Grulich

---------- Forwarded message ---------
Od: <[email protected]>
Date: po 14. 6. 2021 v 8:04
Subject: [Fedora Weblate] New alert on fedora-media-writer/MediaWriter
To: <[email protected]>


New alert
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/>
Could not merge the repository.

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 (Korean)
Using index info to reconstruct a base tree...
M	po/mediawriter_ko.po
Falling back to patching base and 3-way merge...
Auto-merging po/mediawriter_ko.po
CONFLICT (content): Merge conflict in po/mediawriter_ko.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 (Korean)

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".

 (1)

Typical workflow for fixing merge conflicts

   1. Commit all pending changes in Weblate and lock the translation
   component.
   wlc commit; wlc lock
   2. Add Weblate exported repository as a remote.
   git remote add weblate
   https://translate.fedoraproject.org/git/fedora-media-writer/mediawriter/
   ; git remote update weblate
   3. Merge Weblate changes and resolve any conflicts.
   git merge weblate/main
   4. Push changes into upstream repository.
   git push origin main
   5. Weblate should now be able to see updated repository and you can
   unlock it.
   wlc pull ; wlc unlock

Check the FAQ for info on how to resolve this.
<https://docs.weblate.org/en/weblate-4.6.2/faq.html#merge>
View all alerts
<https://translate.fedoraproject.org/projects/fedora-media-writer/mediawriter/#alerts>
Component Information
Languages 36
<https://translate.fedoraproject.org/projects/fedora-media-writer/mediawriter/>
All strings 8,568
Translated strings 4,631 54%
Not translated strings 3,588 41%
Strings needing action 3,937 45%
Strings marked for edit 349 4%
View
<https://translate.fedoraproject.org/projects/fedora-media-writer/mediawriter/>


Weblate, the libre continuous localization system. <https://weblate.org/>

▸ Notification settings
<https://translate.fedoraproject.org/accounts/profile/#notifications>

▸ Turn off this notification
<https://translate.fedoraproject.org/accounts/unsubscribe/?i=3950:1lsfho:SCJQx3FdLWADofYPO8vpOWKOJqSLh8pSakvo92mkIrg>

Generated on June 14, 2021, 6:04 a.

_______________________________________________
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]
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure