grammar: favor zero, one, two over ... or no

mercurial/revset.py

@@ -1692,7 +1692,7 b' def remote(repo, subset, x):'
 
     from . import hg # avoid start-up nasties
     # i18n: "remote" is a keyword
-    l = getargs(x, 0, 2, _("remote takes one, two or no arguments"))
+    l = getargs(x, 0, 2, _("remote takes zero, one, or two arguments"))
 
     q = '.'
     if len(l) > 0:

mercurial/templater.py

@@ -336,7 +336,7 b' def diff(context, mapping, args):'
     specifying files to include or exclude."""
     if len(args) > 2:
         # i18n: "diff" is a keyword
-        raise error.ParseError(_("diff expects one, two or no arguments"))
+        raise error.ParseError(_("diff expects zero, one, or two arguments"))
 
     def getpatterns(i):
         if i < len(args):