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)
wlc commit; wlc lock
git remote add weblate https://translate.fedoraproject.org/git/fedora-media-writer/mediawriter/ ; git remote update weblate
git merge weblate/main
git push origin main
wlc pull ; wlc unlock
Languages | 36 | |
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% |
Generated on June 14, 2021, 6:04 a.