feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fixes to translatable strings

Browse Source 
Merge-request: 322
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Sergey Belyashov
2011-04-29 09:53:34 +02:00
committed by Oswald Buddenhagen
parent 12b2a5fff0
commit c3fa2d35a0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/valgrind/callgrind/callgrinddatamodel.cpp
View File

@@ -277,7 +277,7 @@ QVariant DataModel::data(const QModelIndex &index, int role) const
} }
} }
ret += "<dt>" + tr("Object:") + "</dt><dd>" + func->object() + "</dd>\n"; ret += "<dt>" + tr("Object:") + "</dt><dd>" + func->object() + "</dd>\n";
ret += "<dt>" + tr("Called:") + "</dt><dd>" + tr("%1 times").arg(func->called()) + "</dd>\n"; ret += "<dt>" + tr("Called:") + "</dt><dd>" + tr("%n time(s)", 0, func->called()) + "</dd>\n";
ret += "</dl><p/>"; ret += "</dl><p/>";
// self/inclusive costs // self/inclusive costs

4
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -871,10 +871,10 @@ void GdbEngine::commandTimeout()
int timeOut = m_commandTimer.interval(); int timeOut = m_commandTimer.interval();
//m_commandTimer.stop(); //m_commandTimer.stop();
const QString msg = tr("The gdb process has not responded " const QString msg = tr("The gdb process has not responded "
"to a command within %1 seconds. This could mean it is stuck " "to a command within %n second(s). This could mean it is stuck "
"in an endless loop or taking longer than expected to perform " "in an endless loop or taking longer than expected to perform "
"the operation.\nYou can choose between waiting " "the operation.\nYou can choose between waiting "
"longer or abort debugging.").arg(timeOut / 1000); "longer or abort debugging.", 0, timeOut / 1000);
QMessageBox *mb = showMessageBox(QMessageBox::Critical, QMessageBox *mb = showMessageBox(QMessageBox::Critical,
tr("GDB not responding"), msg, tr("GDB not responding"), msg,
QMessageBox::Ok | QMessageBox::Cancel); QMessageBox::Ok | QMessageBox::Cancel);

2
src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp
View File

@@ -317,7 +317,7 @@ void MaemoCopyToSysrootStep::run(QFutureInterface<bool> &fi)
MaemoGlobal::removeRecursively(targetFilePath, errorMsg); MaemoGlobal::removeRecursively(targetFilePath, errorMsg);
if (!MaemoGlobal::copyRecursively(deployable.localFilePath, if (!MaemoGlobal::copyRecursively(deployable.localFilePath,
targetFilePath, &errorMsg)) { targetFilePath, &errorMsg)) {
emit addOutput(tr("Sysroot installation failed: $1\n" emit addOutput(tr("Sysroot installation failed: %1\n"
" Continuing anyway.").arg(errorMsg), ErrorMessageOutput); " Continuing anyway.").arg(errorMsg), ErrorMessageOutput);
} }
QCoreApplication::processEvents(); QCoreApplication::processEvents();