--- a/hgext/obsolete.py	Thu Jul 26 13:45:09 2012 +0200
+++ b/hgext/obsolete.py	Thu Jul 26 13:40:32 2012 +0200
@@ -371,14 +371,14 @@
     """
     # do not push instability
     for h in outgoing.missingheads:
-        # checking heads only is enought because any thing base on obsolete
-        # changeset is either obsolete or unstable.
+        # Checking heads is enough, obsolete descendants are either
+        # obsolete or unstable.
         ctx = repo[h]
         if ctx.latecomer():
-            raise util.Abort(_("push includes an latecomer changeset: %s!")
+            raise util.Abort(_("push includes a latecomer changeset: %s!")
                              % ctx)
         if ctx.conflicting():
-            raise util.Abort(_("push includes conflicting changeset: %s!")
+            raise util.Abort(_("push includes a conflicting changeset: %s!")
                              % ctx)
     return orig(repo, remote, outgoing, *args, **kwargs)
 
@@ -774,7 +774,8 @@
             try:
                 result = opush(remote, *args, **opts)
             except util.Abort, ex:
-                hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)")
+                hint = _("use 'hg stabilize' to get a stable history "
+                         "or --force to ignore warnings")
                 if (len(ex.args) >= 1
                     and ex.args[0].startswith('push includes ')
                     and ex.hint is None):