# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1283347401 -7200
# Node ID a55e3c50868fc2e827f44187c7fd3f6c4e2f3f31
# Parent  5f44daa8fbd0ab6a1f59a0f8d36505d2cb5f0b5a# Parent  26d86a6cf2afa9d05bf9fb1a2dd1c995b9d9397a
merge with stable

diff -r 5f44daa8fbd0 -r a55e3c50868f mercurial/dagparser.py
--- a/mercurial/dagparser.py	Tue Aug 31 11:57:02 2010 +0200
+++ b/mercurial/dagparser.py	Wed Sep 01 15:23:21 2010 +0200
@@ -268,7 +268,7 @@
                 s += c
                 i += 1
                 c = nextch()
-            raise util.Abort("invalid character in dag description: %s..." % s)
+            raise util.Abort(_("invalid character in dag description: %s...") % s)
 
 def dagtextlines(events,
                  addspaces=True,
@@ -296,14 +296,14 @@
 
                 # sanity check
                 if r != wantr:
-                    raise util.Abort("Expected id %i, got %i" % (wantr, r))
+                    raise util.Abort(_("expected id %i, got %i") % (wantr, r))
                 if not ps:
                     ps = [-1]
                 else:
                     for p in ps:
                         if p >= r:
-                            raise util.Abort("Parent id %i is larger than "
-                                             "current id %i" % (p, r))
+                            raise util.Abort(_("parent id %i is larger than "
+                                               "current id %i") % (p, r))
                 wantr += 1
 
                 # new root?
diff -r 5f44daa8fbd0 -r a55e3c50868f mercurial/match.py
--- a/mercurial/match.py	Tue Aug 31 11:57:02 2010 +0200
+++ b/mercurial/match.py	Wed Sep 01 15:23:21 2010 +0200
@@ -7,6 +7,7 @@
 
 import re
 import util
+from i18n import _
 
 class match(object):
     def __init__(self, root, cwd, patterns, include=[], exclude=[],
@@ -214,8 +215,8 @@
             try:
                 re.compile('(?:%s)' % _regex(k, p, tail))
             except re.error:
-                raise util.Abort("invalid pattern (%s): %s" % (k, p))
-        raise util.Abort("invalid pattern")
+                raise util.Abort(_("invalid pattern (%s): %s") % (k, p))
+        raise util.Abort(_("invalid pattern"))
 
 def _normalize(names, default, root, cwd):
     pats = []