diff --git a/TODO b/TODO
index 7bec2d74f..c46919b2d 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,7 @@
* Streams - remove beginResetModel() usagfe - need to be using beingInsert, etc.
-* USE BOLD TEXT, NOT ITALIC in message boxes
+----
* Add next/prev provider buttons to lyrics page - so that can try others.
diff --git a/gui/streamspage.cpp b/gui/streamspage.cpp
index 9f02233f3..cf1ce1acf 100644
--- a/gui/streamspage.cpp
+++ b/gui/streamspage.cpp
@@ -179,9 +179,9 @@ void StreamsPage::importXml()
if (!model.import(fileName)) {
#ifdef ENABLE_KDE_SUPPORT
- KMessageBox::error(this, i18n("Failed to import %1!
Please check this is of the correct type.", fileName));
+ KMessageBox::error(this, i18n("Failed to import %1!
Please check this is of the correct type.", fileName));
#else
- QMessageBox::critical(this, tr("Error"), tr("Failed to import %1!
Please check this is of the correct type.").arg(fileName));
+ QMessageBox::critical(this, tr("Error"), tr("Failed to import %1!
Please check this is of the correct type.").arg(fileName));
#endif
}
}
@@ -200,9 +200,9 @@ void StreamsPage::exportXml()
if (!model.save(fileName)) {
#ifdef ENABLE_KDE_SUPPORT
- KMessageBox::error(this, i18n("Failed to create %1!", fileName));
+ KMessageBox::error(this, i18n("Failed to create %1!", fileName));
#else
- QMessageBox::critical(this, tr("Error"), tr("Failed to create %1!").arg(fileName));
+ QMessageBox::critical(this, tr("Error"), tr("Failed to create %1!").arg(fileName));
#endif
}
}
@@ -218,18 +218,18 @@ void StreamsPage::add()
QString existing=model.name(url);
if (!existing.isEmpty()) {
#ifdef ENABLE_KDE_SUPPORT
- KMessageBox::error(this, i18n("Stream already exists!
%1", existing));
+ KMessageBox::error(this, i18n("Stream already exists!
%1", existing));
#else
- QMessageBox::critical(this, tr("Error"), tr("Stream already exists!
%1").arg(existing));
+ QMessageBox::critical(this, tr("Error"), tr("Stream already exists!
%1").arg(existing));
#endif
return;
}
if (!model.add(name, url, dlg.favorite())) {
#ifdef ENABLE_KDE_SUPPORT
- KMessageBox::error(this, i18n("A stream named %1 already exists!", name));
+ KMessageBox::error(this, i18n("A stream named %1 already exists!", name));
#else
- QMessageBox::critical(this, tr("Error"), tr("A stream named %1 already exists!").arg(name));
+ QMessageBox::critical(this, tr("Error"), tr("A stream named %1 already exists!").arg(name));
#endif
}
}
@@ -250,14 +250,14 @@ void StreamsPage::remove()
QString firstName=model.data(firstIndex, Qt::DisplayRole).toString();
#ifdef ENABLE_KDE_SUPPORT
if (KMessageBox::No==KMessageBox::warningYesNo(this, selected.size()>1 ? i18n("Are you sure you wish to remove the %1 selected streams?").arg(selected.size())
- : i18n("Are you sure you wish to remove %1?").arg(firstName),
+ : i18n("Are you sure you wish to remove %1?").arg(firstName),
selected.size()>1 ? i18n("Remove Streams?") : i18n("Remove Stream?"))) {
return;
}
#else
if (QMessageBox::No==QMessageBox::warning(this, selected.size()>1 ? tr("Remove Streams?") : tr("Remove Stream?"),
selected.size()>1 ? tr("Are you sure you wish to remove the %1 selected streams?").arg(selected.size())
- : tr("Are you sure you wish to remove %1?").arg(firstName),
+ : tr("Are you sure you wish to remove %1?").arg(firstName),
QMessageBox::Yes|QMessageBox::No, QMessageBox::No)) {
return;
}
@@ -296,15 +296,15 @@ void StreamsPage::edit()
//
if (!existingNameForUrl.isEmpty()) {
#ifdef ENABLE_KDE_SUPPORT
- KMessageBox::error(this, i18n("Stream already exists!
%1", existingNameForUrl));
+ KMessageBox::error(this, i18n("Stream already exists!
%1", existingNameForUrl));
#else
- QMessageBox::critical(this, tr("Error"), tr("Stream already exists!
%1").arg(existingNameForUrl));
+ QMessageBox::critical(this, tr("Error"), tr("Stream already exists!
%1").arg(existingNameForUrl));
#endif
} else if (newName!=name && model.entryExists(newName)) {
#ifdef ENABLE_KDE_SUPPORT
- KMessageBox::error(this, i18n("A stream named %1 already exists!", newName));
+ KMessageBox::error(this, i18n("A stream named %1 already exists!", newName));
#else
- QMessageBox::critical(this, tr("Error"), tr("A stream named %1 already exists!").arg(newName));
+ QMessageBox::critical(this, tr("Error"), tr("A stream named %1 already exists!").arg(newName));
#endif
} else {
model.edit(index, newName, newUrl, dlg.favorite());
diff --git a/mpd/mpdconnection.cpp b/mpd/mpdconnection.cpp
index f061e194b..8e8a8bccc 100644
--- a/mpd/mpdconnection.cpp
+++ b/mpd/mpdconnection.cpp
@@ -766,9 +766,9 @@ void MPDConnection::renamePlaylist(const QString oldName, const QString newName)
if (!sendCommand(data).ok && ui) {
#ifdef ENABLE_KDE_SUPPORT
- QString message=i18n("Sorry, failed to rename %1 to %2").arg(oldName).arg(newName);
+ QString message=i18n("Sorry, failed to rename %1 to %2").arg(oldName).arg(newName);
#else
- QString message=tr("Sorry, failed to rename %1 to %2").arg(oldName).arg(newName);
+ QString message=tr("Sorry, failed to rename %1 to %2").arg(oldName).arg(newName);
#endif
QMetaObject::invokeMethod(ui, "showError", Qt::QueuedConnection, Q_ARG(QString, message));
}
@@ -791,9 +791,9 @@ void MPDConnection::savePlaylist(QString name)
if (!sendCommand(data).ok && ui) {
#ifdef ENABLE_KDE_SUPPORT
- QString message=i18n("Sorry, failed to save %1").arg(name);
+ QString message=i18n("Sorry, failed to save %1").arg(name);
#else
- QString message=tr("Sorry, failed to save %1").arg(name);
+ QString message=tr("Sorry, failed to save %1").arg(name);
#endif
QMetaObject::invokeMethod(ui, "showError", Qt::QueuedConnection, Q_ARG(QString, message));
}