fix kuit markup calls

when using markup tags one must use xi18n* or the markup will not be
interpreted. while we fixed this for most of the code a while ago there
still were broken uses around.
I applied numerous rather aggressive search patterns, such that now at
least all strings using tags should be xi18n'd

5 files changed, 17 insertions, 17 deletions

diff --git a/libmuon/backends/ApplicationBackend/Application.cpp b/libmuon/backends/ApplicationBackend/Application.cpp
index 0066510..337792b 100644
--- a/libmuon/backends/ApplicationBackend/Application.cpp
+++ b/libmuon/backends/ApplicationBackend/Application.cpp
@@ -599,12 +599,12 @@ void Application::processChangelog(KJob* j)
         changelog = buildDescription(job->data(), m_package->sourcePackage());
 
     if (changelog.isEmpty()) {
-        if (m_package->origin() == QLatin1String("Ubuntu")) {
-            changelog = i18nc("@info/rich", "The list of changes is not yet available. "
-                                            "Please use <link url='%1'>Launchpad</link> instead.",
-                                            QStringLiteral("http://launchpad.net/ubuntu/+source/") + m_package->sourcePackage());
+        if (m_package->origin() == QStringLiteral("Ubuntu")) {
+            changelog = xi18nc("@info/rich", "The list of changes is not yet available. "
+                                             "Please use <link url='%1'>Launchpad</link> instead.",
+                                             QStringLiteral("http://launchpad.net/ubuntu/+source/") + m_package->sourcePackage());
         } else {
-            changelog = i18nc("@info", "The list of changes is not yet available.");
+            changelog = xi18nc("@info", "The list of changes is not yet available.");
         }
     }
     emit changelogFetched(changelog);
diff --git a/libmuonapt/HistoryView/HistoryView.cpp b/libmuonapt/HistoryView/HistoryView.cpp
index 820a46e..1cf9e15 100644
--- a/libmuonapt/HistoryView/HistoryView.cpp
+++ b/libmuonapt/HistoryView/HistoryView.cpp
@@ -45,7 +45,7 @@ HistoryView::HistoryView(QWidget *parent)
     QHBoxLayout *headerLayout = new QHBoxLayout(headerWidget);
 
     QLabel *headerLabel = new QLabel(headerWidget);
-    headerLabel->setText(i18nc("@info", "<title>History</title>"));
+    headerLabel->setText(xi18nc("@info", "<title>History</title>"));
 
     QWidget *headerSpacer = new QWidget(headerWidget);
     headerSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
diff --git a/muon/DetailsTabs/ChangelogTab.cpp b/muon/DetailsTabs/ChangelogTab.cpp
index dba4b7a..11daafd 100644
--- a/muon/DetailsTabs/ChangelogTab.cpp
+++ b/muon/DetailsTabs/ChangelogTab.cpp
@@ -84,10 +84,10 @@ void ChangelogTab::changelogFetched(KJob *job)
 
     m_busyWidget->stop();
     if (job->error() || !changelogFile.open(QFile::ReadOnly)) {
-        if (m_package->origin() == QLatin1String("Ubuntu")) {
-            m_changelogBrowser->setText(i18nc("@info/rich", "The list of changes is not yet available. "
-                                            "Please use <link url='%1'>Launchpad</link> instead.",
-                                            QStringLiteral("http://launchpad.net/ubuntu/+source/") + m_package->sourcePackage()));
+        if (m_package->origin() == QStringLiteral("Ubuntu")) {
+            m_changelogBrowser->setText(xi18nc("@info/rich", "The list of changes is not yet available. "
+                                               "Please use <link url='%1'>Launchpad</link> instead.",
+                                               QStringLiteral("http://launchpad.net/ubuntu/+source/") + m_package->sourcePackage()));
         } else {
             m_changelogBrowser->setText(i18nc("@info", "The list of changes is not yet available."));
         }
diff --git a/muon/MainWindow.cpp b/muon/MainWindow.cpp
index 2f77b91..4427f34 100644
--- a/muon/MainWindow.cpp
+++ b/muon/MainWindow.cpp
@@ -220,11 +220,11 @@ void MainWindow::markUpgrade()
     m_backend->markPackagesForUpgrade();
 
     if (m_backend-> markedPackages().isEmpty()) {
-        QString text = i18nc("@label", "Unable to mark upgrades. The "
-                             "available upgrades may require new packages to "
-                             "be installed or removed. You may wish to try "
-                             "a full upgrade by clicking the <interface>Full "
-                             "Upgrade</interface> button.");
+        QString text = xi18nc("@label", "Unable to mark upgrades. The "
+                              "available upgrades may require new packages to "
+                              "be installed or removed. You may wish to try "
+                              "a full upgrade by clicking the <interface>Full "
+                              "Upgrade</interface> button.");
         QString title = i18nc("@title:window", "Unable to Mark Upgrades");
         KMessageBox::information(this, text, title);
     } else {
diff --git a/updater/ChangelogWidget.cpp b/updater/ChangelogWidget.cpp
index f736c8f..664abc8 100644
--- a/updater/ChangelogWidget.cpp
+++ b/updater/ChangelogWidget.cpp
@@ -150,8 +150,8 @@ void ChangelogWidget::changelogFetched(const QString& changelog)
         // Work around http://bugreports.qt.nokia.com/browse/QTBUG-2533 by forcibly resetting the CharFormat
         m_changelogBrowser->setCurrentCharFormat(QTextCharFormat());
         QString fullText;
-        fullText += i18nc("@info/rich", "<p><b>Package Name:</b> <a href='package:%1'>%1</a></p>", m_package->packageName());
-        fullText += i18nc("@info/rich", "<p><b>Installed Version:</b> %1</p>", m_package->installedVersion());
+        fullText += xi18nc("@info/rich", "<p><b>Package Name:</b> <a href='package:%1'>%1</a></p>", m_package->packageName());
+        fullText += xi18nc("@info/rich", "<p><b>Installed Version:</b> %1</p>", m_package->installedVersion());
         fullText += changelog;
         m_changelogBrowser->setHtml(fullText);
     }