Mercurial > hg > easyhg
comparison 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 |
comparison
equal
deleted
inserted
replaced
482:c6ea3eb00635 | 483:a582c6417004 |
---|---|
2061 case ACT_TEST_HG: | 2061 case ACT_TEST_HG: |
2062 MoreInformationDialog::warning | 2062 MoreInformationDialog::warning |
2063 (this, | 2063 (this, |
2064 tr("Failed to run Mercurial"), | 2064 tr("Failed to run Mercurial"), |
2065 tr("Failed to run Mercurial"), | 2065 tr("Failed to run Mercurial"), |
2066 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), | 2066 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), |
2067 output); | 2067 output); |
2068 settings(SettingsDialog::PathsTab); | 2068 settings(SettingsDialog::PathsTab); |
2069 return; | 2069 return; |
2070 case ACT_TEST_HG_EXT: | 2070 case ACT_TEST_HG_EXT: |
2071 MoreInformationDialog::warning | 2071 MoreInformationDialog::warning |
2164 | 2164 |
2165 MoreInformationDialog::warning | 2165 MoreInformationDialog::warning |
2166 (this, | 2166 (this, |
2167 tr("Command failed"), | 2167 tr("Command failed"), |
2168 tr("Command failed"), | 2168 tr("Command failed"), |
2169 tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See “More Details” for the command output."), | 2169 (output == "" ? |
2170 tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.") : | |
2171 tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See “More Details” for the command output.")), | |
2170 output); | 2172 output); |
2171 } | 2173 } |
2172 | 2174 |
2173 void MainWindow::commandCompleted(HgAction completedAction, QString output) | 2175 void MainWindow::commandCompleted(HgAction completedAction, QString output) |
2174 { | 2176 { |