1. Stefan Saasen
  2. git

Commits

Xingcan LAN  committed 6672dc8

l10n: Improve zh_CN translation for msg "not something we can merge"

Signed-off-by: Thynson <lanxingcan@gmail.com>

  • Participants
  • Parent commits 1aabac6
  • Branches master

Comments (0)

Files changed (1)

File po/zh_CN.po

View file
 #: builtin/merge.c:1275 builtin/merge.c:1319
 #, c-format
 msgid "%s - not something we can merge"
-msgstr "%s - 不是我们可以合并的东西"
+msgstr "%s - 不能被合并"
 
 #: builtin/merge.c:1385
 #, c-format