Commit e534265e authored by Friedemann Kleint's avatar Friedemann Kleint Committed by con

I18n: Updated German translation, fixed tr-Bugs for 1.2.9

(cherry picked from commit a04d0978)
parent b7ad5caf
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -297,7 +297,7 @@ DebuggerSettings *DebuggerSettings::instance()
item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("SelectedPluginBreakpointsPattern"));
item->setDefaultValue(QString(".*"));
item->setDefaultValue(QLatin1String(".*"));
instance->insertItem(SelectedPluginBreakpointsPattern, item);
item = new SavedAction(instance);
......
......@@ -295,13 +295,13 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
} else if (act == actWatchKnownMemory) {
(void) new MemoryViewAgent(m_manager, address);
} else if (act == actWatchUnknownMemory) {
QLabel *label = new QLabel("Enter an address: ");
QLabel *label = new QLabel(tr("Enter an address: "));
QLineEdit *lineEdit = new QLineEdit;
QHBoxLayout *layout = new QHBoxLayout;
layout->addWidget(label);
layout->addWidget(lineEdit);
QDialog dialog(this);
dialog.setWindowTitle("Select start address");
dialog.setWindowTitle(tr("Select start address"));
dialog.setLayout(layout);
connect(lineEdit, SIGNAL(returnPressed()), &dialog, SLOT(accept()));
if (dialog.exec() == QDialog::Accepted)
......
......@@ -282,7 +282,7 @@ void DependenciesWidget::updateDetails()
} else if (dependsOn.count() == 1) {
text =tr("%1 depends on %2.").arg(m_project->name(), dependsOn.first());
} else {
text = tr("%1 depends on: %2.").arg(m_project->name(), dependsOn.join(tr(", ")));
text = tr("%1 depends on: %2.").arg(m_project->name(), dependsOn.join(QLatin1String(", ")));
}
m_titleLabel->setText(text);
}
......
......@@ -218,7 +218,7 @@ void QMakeStepConfigWidget::updateTitleLabel()
{
const QtVersion *qtVersion = static_cast<Qt4Project *>(m_step->project())->qtVersion(m_buildConfiguration);
if (!qtVersion) {
m_summaryText = tr("<b>QMake:</b> No qt version set. QMake can't be run.");
m_summaryText = tr("<b>QMake:</b> No Qt version set. QMake can not be run.");
emit updateSummary();
return;
}
......@@ -231,7 +231,7 @@ void QMakeStepConfigWidget::updateTitleLabel()
// And we only use the .pro filename not the full path
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName();
m_summaryText = tr("<b>QMake:</b> %1 %2").arg(program, args.join(" "));
m_summaryText = tr("<b>QMake:</b> %1 %2").arg(program, args.join(QString(QLatin1Char(' '))));
emit updateSummary();
}
......@@ -287,9 +287,9 @@ void QMakeStepConfigWidget::updateEffectiveQMakeCall()
const QtVersion *qtVersion = static_cast<Qt4Project *>(m_step->project())->qtVersion(m_buildConfiguration);
if (qtVersion) {
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName();
m_ui.qmakeArgumentsEdit->setPlainText(program + " " + ProjectExplorer::Environment::joinArgumentList(m_step->arguments(m_buildConfiguration)));
m_ui.qmakeArgumentsEdit->setPlainText(program + QLatin1Char(' ') + ProjectExplorer::Environment::joinArgumentList(m_step->arguments(m_buildConfiguration)));
} else {
m_ui.qmakeArgumentsEdit->setPlainText(tr("No valid qt version set."));
m_ui.qmakeArgumentsEdit->setPlainText(tr("No valid Qt version set."));
}
}
......
......@@ -624,7 +624,7 @@ void S60DeviceRunControl::makesisProcessFinished()
<< sisxFile << QDir::toNativeSeparators(signature)
<< QDir::toNativeSeparators(key);
m_signsis->setWorkingDirectory(m_workingDirectory);
emit addToOutputWindow(this, tr("%1 %2").arg(QDir::toNativeSeparators(signsisTool), arguments.join(tr(" "))));
emit addToOutputWindow(this, tr("%1 %2").arg(QDir::toNativeSeparators(signsisTool), arguments.join(QString(QLatin1Char(' ')))));
m_signsis->start(signsisTool, arguments, QIODevice::ReadOnly);
}
......@@ -711,7 +711,7 @@ void S60DeviceRunControl::processFailed(const QString &program, QProcess::Proces
errorString = tr("%1 has unexpectedly finished.");
break;
default:
errorString = tr("Some error has occurred while running %1.");
errorString = tr("An error has occurred while running %1.");
}
error(this, errorString.arg(program));
emit finished();
......
......@@ -133,7 +133,7 @@ void Qt4ProjectConfigWidget::updateDetails()
versionString = version->name();
}
// Qt Version, Build Directory and Toolchain
m_ui->titleLabel->setText(tr("using Qt Version: <b>%1</b><br>"
m_ui->titleLabel->setText(tr("using Qt version: <b>%1</b><br>"
"with tool chain <b>%2</b><br>"
"building in <b>%3</b>")
.arg(versionString,
......
......@@ -320,6 +320,7 @@ void QtOptionsPageWidget::removeQtDir()
// Format html table tooltip about helpers
static inline QString msgHtmlHelperToolTip(const QFileInfo &fi)
{
//: Tooltip showing the debugging helper library file.
return QtOptionsPageWidget::tr("<html><body><table><tr><td>File:</td><td><pre>%1</pre></td></tr>"
"<tr><td>Last&nbsp;modified:</td><td>%2</td></tr>"
"<tr><td>Size:</td><td>%3 Bytes</td></tr></table></body></html>").
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment