Please sign in to see the alerts.
| Project website | https://github.com/fedora-sysv | |
|---|---|---|
| Mailing list for translators | trans@lists.fedoraproject.org | |
| Translation process |
|
|
| Translation license | GNU General Public License v2.0 or later | |
| Repository |
https://github.com/fedora-sysv/chkconfig
|
|
| Repository branch | master | |
| Last remote commit |
1.13
2bc41fe
 jamacku authored a month ago |
|
| Repository containing Weblate translations |
https://translate.fedoraproject.org/git/fedora-sysv/chkconfig/
|
|
| Filemask | po/*.po |
|
| Number of strings | 7,471 | |
| Number of words | 43,339 | |
| Number of characters | 280,252 | |
| Number of languages | 70 | |
| Number of source strings | 108 | |
| Number of source words | 625 | |
| Number of source characters | 4,074 | |
mansil
NoneFirst, rewinding head to replay your work on top of it... Applying: Update translation files Using index info to reconstruct a base tree... M po/ar.po M po/as.po M po/bal.po M po/be.po M po/bg.po M po/bn.po M po/bn_IN.po M po/bs.po M po/ca.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fur.po M po/gl.po M po/gu.po M po/hi.po M po/hr.po M po/hu.po M po/ia.po M po/id.po M po/is.po M po/it.po M po/ja.po M po/ka.po M po/km.po M po/kn.po M po/ko.po M po/lv.po M po/mai.po M po/mk.po M po/ml.po M po/mr.po M po/ms.po M po/nb.po M po/nds.po M po/nl.po M po/nn.po M po/or.po M po/pa.po M po/pl.po M po/pt.po M po/pt_BR.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/tg.po M po/th.po M po/tr.po M po/uk.po M po/ur.po M po/vi.po M po/zh_CN.po M po/zh_TW.po Falling back to patching base and 3-way merge... Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po Auto-merging po/tr.po CONFLICT (content): Merge conflict in po/tr.po Auto-merging po/pl.po CONFLICT (content): Merge conflict in po/pl.po Auto-merging po/nl.po CONFLICT (content): Merge conflict in po/nl.po Auto-merging po/fur.po Auto-merging po/fr.po CONFLICT (content): Merge conflict in po/fr.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Update translation files 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)a week ago
First, rewinding head to replay your work on top of it... Applying: Update translation files Using index info to reconstruct a base tree... M po/ar.po M po/as.po M po/bal.po M po/be.po M po/bg.po M po/bn.po M po/bn_IN.po M po/bs.po M po/ca.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fur.po M po/gl.po M po/gu.po M po/hi.po M po/hr.po M po/hu.po M po/ia.po M po/id.po M po/is.po M po/it.po M po/ja.po M po/ka.po M po/km.po M po/kn.po M po/ko.po M po/lv.po M po/mai.po M po/mk.po M po/ml.po M po/mr.po M po/ms.po M po/nb.po M po/nds.po M po/nl.po M po/nn.po M po/or.po M po/pa.po M po/pl.po M po/pt.po M po/pt_BR.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/tg.po M po/th.po M po/tr.po M po/uk.po M po/ur.po M po/vi.po M po/zh_CN.po M po/zh_TW.po Falling back to patching base and 3-way merge... Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po Auto-merging po/tr.po CONFLICT (content): Merge conflict in po/tr.po Auto-merging po/pl.po CONFLICT (content): Merge conflict in po/pl.po Auto-merging po/nl.po CONFLICT (content): Merge conflict in po/nl.po Auto-merging po/fur.po Auto-merging po/fr.po CONFLICT (content): Merge conflict in po/fr.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Update translation files 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)a week ago