diff src/mainwindow.cpp @ 483:a582c6417004

Some textual updates; include final URL path element in default for local file on clone
author Chris Cannam
date Wed, 17 Aug 2011 15:53:17 +0100
parents 7e8688784980
children 896b7903e8f2
line wrap: on
line diff
--- a/src/mainwindow.cpp	Tue Aug 16 17:13:35 2011 +0100
+++ b/src/mainwindow.cpp	Wed Aug 17 15:53:17 2011 +0100
@@ -2063,7 +2063,7 @@
             (this,
              tr("Failed to run Mercurial"),
              tr("Failed to run Mercurial"),
-             tr("The Mercurial program either could not be found or failed to run.<br>Check that the Mercurial program path is correct in %1.").arg(setstr),
+             tr("The Mercurial program either could not be found or failed to run.<br><br>Check that the Mercurial program path is correct in %1.").arg(setstr),
              output);
         settings(SettingsDialog::PathsTab);
         return;
@@ -2166,7 +2166,9 @@
         (this,
          tr("Command failed"),
          tr("Command failed"),
-         tr("A Mercurial command failed to run correctly.  This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See &ldquo;More Details&rdquo; for the command output."),
+         (output == "" ?
+          tr("A Mercurial command failed to run correctly.  This may indicate an installation problem or some other problem with EasyMercurial.") :
+          tr("A Mercurial command failed to run correctly.  This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See &ldquo;More Details&rdquo; for the command output.")),
          output);
 }