##// END OF EJS Templates
filemerge: avoid putting translated text into docstring...
FUJIWARA Katsunori -
r39303:88c5a3ef default
parent child Browse files
Show More
@@ -990,9 +990,21 b' def loadinternalmerge(ui, extname, regis'
990 990
991 991 capabilities = sorted([k for k, v in func.capabilities.items() if v])
992 992 if capabilities:
993 capdesc = _("(actual capabilities: %s)") % ', '.join(capabilities)
993 capdesc = " (actual capabilities: %s)" % ', '.join(capabilities)
994 994 func.__doc__ = (func.__doc__ +
995 pycompat.sysstr("\n\n %s" % capdesc))
995 pycompat.sysstr("\n\n%s" % capdesc))
996
997 # to put i18n comments into hg.pot for automatically generated texts
998
999 # i18n: "binary" and "symlik" are keywords
1000 # i18n: this text is added automatically
1001 _(" (actual capabilities: binary, symlink)")
1002 # i18n: "binary" is keyword
1003 # i18n: this text is added automatically
1004 _(" (actual capabilities: binary)")
1005 # i18n: "symlink" is keyword
1006 # i18n: this text is added automatically
1007 _(" (actual capabilities: symlink)")
996 1008
997 1009 # load built-in merge tools explicitly to setup internalsdoc
998 1010 loadinternalmerge(None, None, internaltool)
General Comments 0
You need to be logged in to leave comments. Login now