- Use &Hijacked file
+ Use &Hijacked file
true
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index a103ad599d9..79f5662297f 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -710,7 +710,7 @@ void ClearCasePlugin::undoHijackCurrent()
Ui::UndoCheckOut unhijackUi;
QDialog unhijackDlg;
unhijackUi.setupUi(&unhijackDlg);
- unhijackDlg.setWindowTitle(tr("Undo hijack file"));
+ unhijackDlg.setWindowTitle(tr("Undo Hijack File"));
unhijackUi.lblMessage->setText(tr("Do you want to undo hijack of '%1'?")
.arg(QDir::toNativeSeparators(fileName)));
if (unhijackDlg.exec() != QDialog::Accepted)
@@ -1185,7 +1185,7 @@ ClearCaseResponse
ClearCaseResponse response;
if (executable.isEmpty()) {
response.error = true;
- response.message = tr("No ClearCase executable specified!");
+ response.message = tr("No ClearCase executable specified.");
return response;
}
@@ -1269,7 +1269,7 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName
(fi.isWritable() || s_statusMap[relFile].status == FileStatus::Unknown))
QtConcurrent::run(&sync, topLevel, QStringList(relFile)).waitForFinished();
if (s_statusMap[relFile].status == FileStatus::CheckedOut) {
- QMessageBox::information(0, tr("ClearCase Checkout"), tr("File is already checked out!"));
+ QMessageBox::information(0, tr("ClearCase Checkout"), tr("File is already checked out."));
return true;
}
bool isHijacked = (s_statusMap[relFile].status & FileStatus::Hijacked);
@@ -1492,7 +1492,7 @@ bool ClearCasePlugin::vcsAdd(const QString &workingDir, const QString &fileName)
bool ClearCasePlugin::vcsDelete(const QString &workingDir, const QString &fileName)
{
const QString title(tr("ClearCase Remove Element"));
- if (QMessageBox::warning(0, title, tr("This operation is irreversible! Are you sure?"),
+ if (QMessageBox::warning(0, title, tr("This operation is irreversible. Are you sure?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
return true;
diff --git a/src/plugins/clearcase/settingspage.ui b/src/plugins/clearcase/settingspage.ui
index 06cb74647ab..7f4c3247089 100644
--- a/src/plugins/clearcase/settingspage.ui
+++ b/src/plugins/clearcase/settingspage.ui
@@ -161,7 +161,7 @@
-
- &Index only VOBs:
+ &Index only VOBs:
indexOnlyVOBsEdit
diff --git a/src/plugins/clearcase/undocheckout.ui b/src/plugins/clearcase/undocheckout.ui
index a830f840913..af28f7ed0a6 100644
--- a/src/plugins/clearcase/undocheckout.ui
+++ b/src/plugins/clearcase/undocheckout.ui
@@ -63,7 +63,7 @@
- The file was changed!
+ The file was changed.
diff --git a/src/plugins/clearcase/versionselector.cpp b/src/plugins/clearcase/versionselector.cpp
index 281ae2901f8..cf9614ae269 100644
--- a/src/plugins/clearcase/versionselector.cpp
+++ b/src/plugins/clearcase/versionselector.cpp
@@ -45,6 +45,9 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message
{
ui->setupUi(this);
ui->headerLabel->setText(ui->headerLabel->text().arg(fileName));
+ ui->loadedText->setHtml(tr("NOTE: You will not be able to check in "
+ "this file without merging the changes (not supported by the "
+ "plugin)
"));
m_stream = new QTextStream(message.toLocal8Bit(), QIODevice::ReadOnly | QIODevice::Text);
QString line;
while (!m_stream->atEnd() && !line.contains(QLatin1String("1) Loaded version")))
diff --git a/src/plugins/clearcase/versionselector.ui b/src/plugins/clearcase/versionselector.ui
index 38336a02e5d..b120bcf944a 100644
--- a/src/plugins/clearcase/versionselector.ui
+++ b/src/plugins/clearcase/versionselector.ui
@@ -75,15 +75,7 @@