summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Sitter <sitter@kde.org>2016-07-25 13:18:42 (GMT)
committerHarald Sitter <sitter@kde.org>2016-07-25 13:18:42 (GMT)
commitd109c90d9deb6ff7f2e18f1244801da098916d4f (patch)
tree49188ef321d705922f95869af40473105e153b03
parent0b0c3f8d1e6314a97264072c7907ddc02dc94649 (diff)
fix incorrect markup usage
since kf5 kuit markup needs to be run through xi18n* rather than i18n* (this really should have a build-time check in ki18n... fixing this crap after it was found at runtime is fairly stupid) REVIEW: 128520
-rw-r--r--utils/qapt-batch/qaptbatch.cpp24
-rw-r--r--utils/qapt-gst-helper/PluginHelper.cpp24
2 files changed, 24 insertions, 24 deletions
diff --git a/utils/qapt-batch/qaptbatch.cpp b/utils/qapt-batch/qaptbatch.cpp
index aa0f8ce..2b28afc 100644
--- a/utils/qapt-batch/qaptbatch.cpp
+++ b/utils/qapt-batch/qaptbatch.cpp
@@ -268,8 +268,8 @@ void QAptBatch::errorOccurred(QApt::ErrorCode code)
void QAptBatch::provideMedium(const QString &label, const QString &mountPoint)
{
QString title = i18nc("@title:window", "Media Change Required");
- QString text = i18nc("@label", "Please insert %1 into <filename>%2</filename>",
- label, mountPoint);
+ QString text = xi18nc("@label", "Please insert %1 into <filename>%2</filename>",
+ label, mountPoint);
KMessageBox::informationWId(m_winId, text, title);
m_trans->provideMedium(mountPoint);
}
@@ -277,16 +277,16 @@ void QAptBatch::provideMedium(const QString &label, const QString &mountPoint)
void QAptBatch::untrustedPrompt(const QStringList &untrustedPackages)
{
QString title = i18nc("@title:window", "Warning - Unverified Software");
- QString text = i18ncp("@label",
- "The following piece of software cannot be verified. "
- "<warning>Installing unverified software represents a "
- "security risk, as the presence of unverifiable software "
- "can be a sign of tampering.</warning> Do you wish to continue?",
- "The following pieces of software cannot be authenticated. "
- "<warning>Installing unverified software represents a "
- "security risk, as the presence of unverifiable software "
- "can be a sign of tampering.</warning> Do you wish to continue?",
- untrustedPackages.size());
+ QString text = xi18ncp("@label",
+ "The following piece of software cannot be verified. "
+ "<warning>Installing unverified software represents a "
+ "security risk, as the presence of unverifiable software "
+ "can be a sign of tampering.</warning> Do you wish to continue?",
+ "The following pieces of software cannot be authenticated. "
+ "<warning>Installing unverified software represents a "
+ "security risk, as the presence of unverifiable software "
+ "can be a sign of tampering.</warning> Do you wish to continue?",
+ untrustedPackages.size());
int result = KMessageBox::Cancel;
result = KMessageBox::warningContinueCancelListWId(m_winId, text,
diff --git a/utils/qapt-gst-helper/PluginHelper.cpp b/utils/qapt-gst-helper/PluginHelper.cpp
index 45630ef..29cca10 100644
--- a/utils/qapt-gst-helper/PluginHelper.cpp
+++ b/utils/qapt-gst-helper/PluginHelper.cpp
@@ -329,8 +329,8 @@ void PluginHelper::transactionErrorOccurred(QApt::ErrorCode code)
void PluginHelper::provideMedium(const QString &label, const QString &mountPoint)
{
QString title = i18nc("@title:window", "Media Change Required");
- QString text = i18nc("@label", "Please insert %1 into <filename>%2</filename>",
- label, mountPoint);
+ QString text = xi18nc("@label", "Please insert %1 into <filename>%2</filename>",
+ label, mountPoint);
KMessageBox::informationWId(m_winId, text, title);
m_trans->provideMedium(mountPoint);
@@ -339,16 +339,16 @@ void PluginHelper::provideMedium(const QString &label, const QString &mountPoint
void PluginHelper::untrustedPrompt(const QStringList &untrustedPackages)
{
QString title = i18nc("@title:window", "Warning - Unverified Software");
- QString text = i18ncp("@label",
- "The following piece of software cannot be verified. "
- "<warning>Installing unverified software represents a "
- "security risk, as the presence of unverifiable software "
- "can be a sign of tampering.</warning> Do you wish to continue?",
- "The following pieces of software cannot be authenticated. "
- "<warning>Installing unverified software represents a "
- "security risk, as the presence of unverifiable software "
- "can be a sign of tampering.</warning> Do you wish to continue?",
- untrustedPackages.size());
+ QString text = xi18ncp("@label",
+ "The following piece of software cannot be verified. "
+ "<warning>Installing unverified software represents a "
+ "security risk, as the presence of unverifiable software "
+ "can be a sign of tampering.</warning> Do you wish to continue?",
+ "The following pieces of software cannot be authenticated. "
+ "<warning>Installing unverified software represents a "
+ "security risk, as the presence of unverifiable software "
+ "can be a sign of tampering.</warning> Do you wish to continue?",
+ untrustedPackages.size());
int result = KMessageBox::Cancel;
result = KMessageBox::warningContinueCancelListWId(m_winId, text,