[Debian-handbook-translators] Unresolved conflicts are left in zh-CN/01_the-debian-project.po of debian-handbook repository

AYANOKOUZI, Ryuunosuke i38w7i3 at yahoo.co.jp
Mon Oct 9 04:06:55 UTC 2017


Dear Raphael,

Unresolved conflicts in po file (zh-CN/01_the-debian-project.po) was committed.
It causes an error of msgfmt [1].
The problematic commit (3d0baf56883d31a034513554ba55877a69bba11b)[2] is in 
not only 'jessie/master' and 'master' of official but also 'jessie/master' of weblate.
The problem is not fixed most recent commit [3].

We would appreciate it if you could fix the problem.

[1] 
$ git grep -n '^<<<<<<< '
zh-CN/01_the-debian-project.po:461:<<<<<<< HEAD
zh-CN/01_the-debian-project.po:477:<<<<<<< HEAD
$ msgfmt -c -o /dev/null --statistics zh-CN/01_the-debian-project.po
zh-CN/01_the-debian-project.po:460: missing 'msgstr' section
zh-CN/01_the-debian-project.po:461:2: syntax error
zh-CN/01_the-debian-project.po:461: keyword "HEAD" unknown
zh-CN/01_the-debian-project.po:466:2: syntax error
zh-CN/01_the-debian-project.po:469: duplicate message definition...
zh-CN/01_the-debian-project.po:465: ...this is the location of the first definition
zh-CN/01_the-debian-project.po:471:2: syntax error
zh-CN/01_the-debian-project.po:471: keyword "e4e9361a" unknown
zh-CN/01_the-debian-project.po:476: missing 'msgstr' section
zh-CN/01_the-debian-project.po:477:2: syntax error
zh-CN/01_the-debian-project.po:477: keyword "HEAD" unknown
zh-CN/01_the-debian-project.po:481: keyword "e4e9361a" unknown
msgfmt: found 11 fatal errors

[2]
$ git blame -l -L '/^<<<<<<< /,/^>>>>>>> /' -- zh-CN/01_the-debian-project.po
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 461) <<<<<<< HEAD
e3cb8551bef4767b65235805f3bd29c128826d84 (xiao shengwen 2017-09-27 21:43:24 +0800 462) msgstr "<primary>代码名</primary>"
b54ab5694b1f0c7a5f7a8ffa5b137183a2c796b3 (Emfox Zhou    2012-05-25 14:30:28 +0800 463)
b54ab5694b1f0c7a5f7a8ffa5b137183a2c796b3 (Emfox Zhou    2012-05-25 14:30:28 +0800 464) msgid "<primary>name</primary><secondary>codename</secondary>"
e3cb8551bef4767b65235805f3bd29c128826d84 (xiao shengwen 2017-09-27 21:43:24 +0800 465) msgstr "<primary>名称</primary><secondary>代码名</secondary>"
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 466) =======
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 467) msgstr "<primary>代号</primary>"
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 468)
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 469) msgid "<primary>name</primary><secondary>codename</secondary>"
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 470) msgstr "<primary>名称</primary><secondary>代号</secondary>"
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 471) >>>>>>> 1e4e9361a... zh-CN: Translated using Weblate.
$ git blame -l -L '477,/^>>>>>>> /' -- zh-CN/01_the-debian-project.po
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 477) <<<<<<< HEAD
82e962cbc6cea491c5d3f41f0cc47d877a9c6d6a (xiao shengwen 2017-09-28 01:13:31 +0800 478) msgstr "<primary><emphasis role=\"distribution\">巴兹 (Buzz)</emphasis></primary>"
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 479) =======
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 480) msgstr "<primary><emphasis role=\"distribution\">Buzz</emphasis></primary>"
3d0baf56883d31a034513554ba55877a69bba11b (Lou Letian    2017-09-29 13:57:46 +0000 481) >>>>>>> 1e4e9361a... zh-CN: Translated using Weblate.
$ git log --stat --pretty=fuller -1 3d0baf56883d31a034513554ba55877a69bba11b
commit 3d0baf56883d31a034513554ba55877a69bba11b
Author:     Lou Letian <louletian at sina.com>
AuthorDate: Fri Sep 29 13:57:46 2017 +0000
Commit:     Raphaël Hertzog <hertzog at debian.org>
CommitDate: Wed Oct 4 09:56:57 2017 +0200

    zh-CN: Translated using Weblate.

 zh-CN/01_the-debian-project.po | 72 +++++++++++++++++++++++++++++++-----------------------------------------
 1 file changed, 31 insertions(+), 41 deletions(-)

[3]
$ git branch --remotes --verbose --verbose --contains 3d0baf56883d31a034513554ba55877a69bba11b
  origin/HEAD           -> origin/master
  origin/jessie/master  ee472864 nb-NO: Translated using Weblate.
  origin/master         64a11fb8 Merge branch 'jessie/master'
  weblate/jessie/master ee472864 nb-NO: Translated using Weblate.
$ git branch --remotes --verbose --verbose --contains origin/jessie/master
  origin/HEAD           -> origin/master
  origin/jessie/master  ee472864 nb-NO: Translated using Weblate.
  origin/master         64a11fb8 Merge branch 'jessie/master'
  weblate/jessie/master ee472864 nb-NO: Translated using Weblate.

Sincerely yours,
Ryuunosuke Ayanokouzi
-- 
AYANOKOUZI, Ryuunosuke <i38w7i3 at yahoo.co.jp>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 455 bytes
Desc: OpenPGP Digital Signature
URL: <http://lists.alioth.debian.org/pipermail/debian-handbook-translators/attachments/20171009/c1e341d0/attachment.sig>


More information about the Debian-handbook-translators mailing list