# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1285946212 18000
# Node ID 93d8bff78c96fe7e33237b257558ee97290048a4
# Parent  34a9a71d586c45f2b70c0f2b58a64c74f769215e# Parent  14198926975d1aadad4b48e6e829c724d2516d65
merge with i18n

diff -r 34a9a71d586c -r 93d8bff78c96 mercurial/url.py
--- a/mercurial/url.py	Fri Oct 01 11:15:19 2010 -0300
+++ b/mercurial/url.py	Fri Oct 01 10:16:52 2010 -0500
@@ -511,9 +511,10 @@
                         ca_certs=cacerts)
                 msg = _verifycert(self.sock.getpeercert(), self.host)
                 if msg:
-                    raise util.Abort('%s certificate error: %s' % (self.host, msg))
-                self.ui.debug(_('%s certificate successfully verified\n') % 
-                    self.host)
+                    raise util.Abort(_('%s certificate error: %s') %
+                                     (self.host, msg))
+                self.ui.debug('%s certificate successfully verified\n' %
+                              self.host)
             else:
                 httplib.HTTPSConnection.connect(self)