Commit f4b2a70e authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

L10n: tr-Fixes.

parent 0e8c3875
...@@ -121,7 +121,7 @@ void MaemoPackageCreationWidget::updateVersionInfo(const ProjectExplorer::Projec ...@@ -121,7 +121,7 @@ void MaemoPackageCreationWidget::updateVersionInfo(const ProjectExplorer::Projec
QString error; QString error;
QString versionString = m_step->versionString(&error); QString versionString = m_step->versionString(&error);
if (versionString.isEmpty()) { if (versionString.isEmpty()) {
QMessageBox::critical(this, tr("No version available."), error); QMessageBox::critical(this, tr("No Version Available."), error);
versionString = MaemoPackageCreationStep::DefaultVersionNumber; versionString = MaemoPackageCreationStep::DefaultVersionNumber;
} }
const QStringList list = versionString.split(QLatin1Char('.'), const QStringList list = versionString.split(QLatin1Char('.'),
...@@ -153,12 +153,12 @@ void MaemoPackageCreationWidget::setPackageManagerIcon() ...@@ -153,12 +153,12 @@ void MaemoPackageCreationWidget::setPackageManagerIcon()
imageFilter += "*." + QString::fromAscii(imageType) + QLatin1Char(' '); imageFilter += "*." + QString::fromAscii(imageType) + QLatin1Char(' ');
imageFilter += QLatin1Char(')'); imageFilter += QLatin1Char(')');
const QString iconFileName = QFileDialog::getOpenFileName(this, const QString iconFileName = QFileDialog::getOpenFileName(this,
tr("Choose image"), QString(), imageFilter); tr("Choose Image"), QString(), imageFilter);
if (!iconFileName.isEmpty()) { if (!iconFileName.isEmpty()) {
QString error; QString error;
if (!MaemoTemplatesManager::instance()->setPackageManagerIcon(m_step-> if (!MaemoTemplatesManager::instance()->setPackageManagerIcon(m_step->
buildConfiguration()->target()->project(), iconFileName, &error)) buildConfiguration()->target()->project(), iconFileName, &error))
QMessageBox::critical(this, tr("Could not set new icon"), error); QMessageBox::critical(this, tr("Could Not Set New Icon"), error);
} }
} }
...@@ -202,7 +202,7 @@ void MaemoPackageCreationWidget::versionInfoChanged() ...@@ -202,7 +202,7 @@ void MaemoPackageCreationWidget::versionInfoChanged()
+ QLatin1Char('.') + m_ui->minor->text() + QLatin1Char('.') + QLatin1Char('.') + m_ui->minor->text() + QLatin1Char('.')
+ m_ui->patch->text(), &error); + m_ui->patch->text(), &error);
if (!success) if (!success)
QMessageBox::critical(this, tr("Could not set version number"), error); QMessageBox::critical(this, tr("Could Not Set Version Number"), error);
} }
void MaemoPackageCreationWidget::editDebianFile() void MaemoPackageCreationWidget::editDebianFile()
......
...@@ -352,9 +352,10 @@ void MaemoRunConfigurationWidget::changeLocalMountDir(const QModelIndex &index) ...@@ -352,9 +352,10 @@ void MaemoRunConfigurationWidget::changeLocalMountDir(const QModelIndex &index)
void MaemoRunConfigurationWidget::handleDebuggingTypeChanged(bool useGdb) void MaemoRunConfigurationWidget::handleDebuggingTypeChanged(bool useGdb)
{ {
m_runConfiguration->setUseRemoteGdb(useGdb); m_runConfiguration->setUseRemoteGdb(useGdb);
const QString detailsText = useGdb ? tr("Use gdb") : tr("Use gdbserver"); const QString detailsText = useGdb ?
m_debugDetailsContainer->setSummaryText(tr("<b>Debugging details:</b> ") tr("<b>Debugging details:</b> Use gdb") :
+ detailsText); tr("<b>Debugging details:</b> Use gdbserver");
m_debugDetailsContainer->setSummaryText(detailsText);
} }
void MaemoRunConfigurationWidget::fetchEnvironment() void MaemoRunConfigurationWidget::fetchEnvironment()
...@@ -421,8 +422,8 @@ void MaemoRunConfigurationWidget::handleRemoteMountsChanged() ...@@ -421,8 +422,8 @@ void MaemoRunConfigurationWidget::handleRemoteMountsChanged()
text = tr("One local directory to be mounted on the device."); text = tr("One local directory to be mounted on the device.");
break; break;
default: default:
text = tr("%1 local directories to be mounted on the device.") //: Note: Only mountCount>1 will occur here as 0, 1 are handled above.
.arg(mountCount); text = tr("%n local directories to be mounted on the device.", 0, mountCount);
break; break;
} }
m_mountDetailsContainer->setSummaryText(QLatin1String("<b>") + text m_mountDetailsContainer->setSummaryText(QLatin1String("<b>") + text
......
...@@ -683,12 +683,8 @@ void S60CreatePackageStepConfigWidget::resetPassphrases() ...@@ -683,12 +683,8 @@ void S60CreatePackageStepConfigWidget::resetPassphrases()
{ {
QMessageBox msgBox(QMessageBox::Question, tr("Reset passwords"), QMessageBox msgBox(QMessageBox::Question, tr("Reset passwords"),
tr("Do you want to reset all saved passwords for used keys?"), tr("Do you want to reset all saved passwords for used keys?"),
QMessageBox::Yes|QMessageBox::No, this); QMessageBox::Reset|QMessageBox::Cancel, this);
msgBox.button(QMessageBox::Yes)->setText(tr("Reset")); if (msgBox.exec() == QMessageBox::Reset)
msgBox.button(QMessageBox::No)->setText(tr("Cancel"));
msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No);
if (msgBox.exec() == QMessageBox::Yes)
m_signStep->resetPassphrases(); m_signStep->resetPassphrases();
} }
...@@ -699,8 +695,7 @@ QString S60CreatePackageStepConfigWidget::summaryText() const ...@@ -699,8 +695,7 @@ QString S60CreatePackageStepConfigWidget::summaryText() const
text = tr("self-signed"); text = tr("self-signed");
} else { } else {
text = tr("signed with certificate %1 and key file %2") text = tr("signed with certificate %1 and key file %2")
.arg(m_signStep->customSignaturePath()) .arg(m_signStep->customSignaturePath(), m_signStep->customKeyPath());
.arg(m_signStep->customKeyPath());
} }
if (m_signStep->createsSmartInstaller()) if (m_signStep->createsSmartInstaller())
return tr("<b>Create SIS Package:</b> %1, using Smart Installer").arg(text); return tr("<b>Create SIS Package:</b> %1, using Smart Installer").arg(text);
......
Supports Markdown
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