Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 39386:bc0eb1dc6aae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix an i18n comment typo
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 29 Aug 2018 22:53:44 -0400
parents a3fd84f4fb38
children 86dfae98a3a2
comparison
equal deleted inserted replaced
39385:57b2a02420cd 39386:bc0eb1dc6aae
996 func.__doc__ = (func.__doc__ + 996 func.__doc__ = (func.__doc__ +
997 pycompat.sysstr("\n\n%s" % capdesc)) 997 pycompat.sysstr("\n\n%s" % capdesc))
998 998
999 # to put i18n comments into hg.pot for automatically generated texts 999 # to put i18n comments into hg.pot for automatically generated texts
1000 1000
1001 # i18n: "binary" and "symlik" are keywords 1001 # i18n: "binary" and "symlink" are keywords
1002 # i18n: this text is added automatically 1002 # i18n: this text is added automatically
1003 _(" (actual capabilities: binary, symlink)") 1003 _(" (actual capabilities: binary, symlink)")
1004 # i18n: "binary" is keyword 1004 # i18n: "binary" is keyword
1005 # i18n: this text is added automatically 1005 # i18n: this text is added automatically
1006 _(" (actual capabilities: binary)") 1006 _(" (actual capabilities: binary)")