Show More
@@ -990,10 +990,22 b' def loadinternalmerge(ui, extname, regis' | |||||
990 |
|
990 | |||
991 | capabilities = sorted([k for k, v in func.capabilities.items() if v]) |
|
991 | capabilities = sorted([k for k, v in func.capabilities.items() if v]) | |
992 | if capabilities: |
|
992 | if capabilities: | |
993 |
capdesc = |
|
993 | capdesc = " (actual capabilities: %s)" % ', '.join(capabilities) | |
994 | func.__doc__ = (func.__doc__ + |
|
994 | func.__doc__ = (func.__doc__ + | |
995 |
pycompat.sysstr("\n\n |
|
995 | pycompat.sysstr("\n\n%s" % capdesc)) | |
996 |
|
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)") | |||
|
1008 | ||||
997 | # load built-in merge tools explicitly to setup internalsdoc |
|
1009 | # load built-in merge tools explicitly to setup internalsdoc | |
998 | loadinternalmerge(None, None, internaltool) |
|
1010 | loadinternalmerge(None, None, internaltool) | |
999 |
|
1011 |
General Comments 0
You need to be logged in to leave comments.
Login now