OK, so I'm resetting the translations to be in sync with upstream. There were languages that had been removed and it was causing issues.
Hope not too many strings are impacted. file 'tryton/health/locale/ht.po' was deleted in other [merge rev] but was modified in local [working copy]. You can use (c)hanged version, (d)elete, or leave (u)nresolved. What do you want to do? u file 'tryton/health/locale/ru.po' was deleted in other [merge rev] but was modified in local [working copy]. You can use (c)hanged version, (d)elete, or leave (u)nresolved. What do you want to do? u file 'tryton/health/locale/sq.po' was deleted in other [merge rev] but was modified in local [working copy]. You can use (c)hanged version, (d)elete, or leave (u)nresolved. What do you want to do? u file 'tryton/health/locale/sv.po' was deleted in other [merge rev] but was modified in local [working copy]. You can use (c)hanged version, (d)elete, or leave (u)nresolved. What do you want to do? u merging tryton/health/locale/ar.po merging tryton/health/locale/es.po merging tryton/health/locale/zh_CN.po merging tryton/health_dentistry/locale/zh_CN.po merging tryton/health_history/locale/zh_CN.po merging tryton/health_imaging/locale/zh_CN.po merging tryton/health_nursing/locale/zh_CN.po merging tryton/health_ophthalmology/locale/zh_CN.po merging tryton/health_qrcodes/locale/zh_CN.po merging tryton/health_qrcodes/locale/zh_CN.po failed! merging tryton/health_reporting/locale/zh_CN.po merging tryton/health_services/locale/zh_CN.po /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:290: duplicate message definition... /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:287: ...this is the location of the first definition /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:330: duplicate message definition... /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:327: ...this is the location of the first definition /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:354: duplicate message definition... /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:351: ...this is the location of the first definition /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:366: duplicate message definition... /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:363: ...this is the location of the first definition /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:379: duplicate message definition... /tmp/hgmerge-bjmd5o0k/zh_CN~local.po:376: ...this is the location of the first definition msggrep: found 5 fatal errors ### /home/weblate/weblate/weblate/examples/git-merge-gettext-po: error near line 171: status 1 merging tryton/health_services/locale/zh_CN.po failed! merging tryton/health_surgery/locale/zh_CN.po 1054 files updated, 10 files merged, 54 files removed, 6 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon (1) On Mon, 18 Dec 2023 08:12:07 +0800 (CST) tumashu <tuma...@163.com> wrote: > seem not > 在 2023-12-18 02:29:12，"Luis Falcon" <fal...@gnuhealth.org> 写道： > Hi, Feng > On Thu, 14 Dec 2023 14:54:16 +0800 (CST) > tumashu <tuma...@163.com> wrote: > > > https://hosted.weblate.org/projects/gnu-health seem to not be > > updated, when sync health hg to it? > > Seems there were some unresolved issues in one merge that blocked > the translations... > > Just unlocked all components.. can you please check? > > Bests > Luis
