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

(cherry picked from commit a04d0978f8)
This commit is contained in:
Friedemann Kleint
2009-08-19 12:32:23 +02:00
committed by con
parent b7ad5caf93
commit e534265e73
8 changed files with 1119 additions and 576 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -297,7 +297,7 @@ DebuggerSettings *DebuggerSettings::instance()
item = new SavedAction(instance); item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("SelectedPluginBreakpointsPattern")); item->setSettingsKey(debugModeGroup, QLatin1String("SelectedPluginBreakpointsPattern"));
item->setDefaultValue(QString(".*")); item->setDefaultValue(QLatin1String(".*"));
instance->insertItem(SelectedPluginBreakpointsPattern, item); instance->insertItem(SelectedPluginBreakpointsPattern, item);
item = new SavedAction(instance); item = new SavedAction(instance);

View File

@@ -295,13 +295,13 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
} else if (act == actWatchKnownMemory) { } else if (act == actWatchKnownMemory) {
(void) new MemoryViewAgent(m_manager, address); (void) new MemoryViewAgent(m_manager, address);
} else if (act == actWatchUnknownMemory) { } else if (act == actWatchUnknownMemory) {
QLabel *label = new QLabel("Enter an address: "); QLabel *label = new QLabel(tr("Enter an address: "));
QLineEdit *lineEdit = new QLineEdit; QLineEdit *lineEdit = new QLineEdit;
QHBoxLayout *layout = new QHBoxLayout; QHBoxLayout *layout = new QHBoxLayout;
layout->addWidget(label); layout->addWidget(label);
layout->addWidget(lineEdit); layout->addWidget(lineEdit);
QDialog dialog(this); QDialog dialog(this);
dialog.setWindowTitle("Select start address"); dialog.setWindowTitle(tr("Select start address"));
dialog.setLayout(layout); dialog.setLayout(layout);
connect(lineEdit, SIGNAL(returnPressed()), &dialog, SLOT(accept())); connect(lineEdit, SIGNAL(returnPressed()), &dialog, SLOT(accept()));
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)

View File

@@ -282,7 +282,7 @@ void DependenciesWidget::updateDetails()
} else if (dependsOn.count() == 1) { } else if (dependsOn.count() == 1) {
text =tr("%1 depends on %2.").arg(m_project->name(), dependsOn.first()); text =tr("%1 depends on %2.").arg(m_project->name(), dependsOn.first());
} else { } 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); m_titleLabel->setText(text);
} }

View File

@@ -218,7 +218,7 @@ void QMakeStepConfigWidget::updateTitleLabel()
{ {
const QtVersion *qtVersion = static_cast<Qt4Project *>(m_step->project())->qtVersion(m_buildConfiguration); const QtVersion *qtVersion = static_cast<Qt4Project *>(m_step->project())->qtVersion(m_buildConfiguration);
if (!qtVersion) { 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(); emit updateSummary();
return; return;
} }
@@ -231,7 +231,7 @@ void QMakeStepConfigWidget::updateTitleLabel()
// And we only use the .pro filename not the full path // And we only use the .pro filename not the full path
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName(); 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(); emit updateSummary();
} }
@@ -287,9 +287,9 @@ void QMakeStepConfigWidget::updateEffectiveQMakeCall()
const QtVersion *qtVersion = static_cast<Qt4Project *>(m_step->project())->qtVersion(m_buildConfiguration); const QtVersion *qtVersion = static_cast<Qt4Project *>(m_step->project())->qtVersion(m_buildConfiguration);
if (qtVersion) { if (qtVersion) {
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName(); 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 { } else {
m_ui.qmakeArgumentsEdit->setPlainText(tr("No valid qt version set.")); m_ui.qmakeArgumentsEdit->setPlainText(tr("No valid Qt version set."));
} }
} }

View File

@@ -624,7 +624,7 @@ void S60DeviceRunControl::makesisProcessFinished()
<< sisxFile << QDir::toNativeSeparators(signature) << sisxFile << QDir::toNativeSeparators(signature)
<< QDir::toNativeSeparators(key); << QDir::toNativeSeparators(key);
m_signsis->setWorkingDirectory(m_workingDirectory); 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); 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."); errorString = tr("%1 has unexpectedly finished.");
break; break;
default: default:
errorString = tr("Some error has occurred while running %1."); errorString = tr("An error has occurred while running %1.");
} }
error(this, errorString.arg(program)); error(this, errorString.arg(program));
emit finished(); emit finished();

View File

@@ -133,7 +133,7 @@ void Qt4ProjectConfigWidget::updateDetails()
versionString = version->name(); versionString = version->name();
} }
// Qt Version, Build Directory and Toolchain // 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>" "with tool chain <b>%2</b><br>"
"building in <b>%3</b>") "building in <b>%3</b>")
.arg(versionString, .arg(versionString,

View File

@@ -320,6 +320,7 @@ void QtOptionsPageWidget::removeQtDir()
// Format html table tooltip about helpers // Format html table tooltip about helpers
static inline QString msgHtmlHelperToolTip(const QFileInfo &fi) 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>" 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>Last&nbsp;modified:</td><td>%2</td></tr>"
"<tr><td>Size:</td><td>%3 Bytes</td></tr></table></body></html>"). "<tr><td>Size:</td><td>%3 Bytes</td></tr></table></body></html>").