don't try to translate QByteArray()

also, proper contexts for containmentactions messages
BUG:336149

containmentactions/contextmenu/menu.cpp

@@ -92,15 +92,15 @@ void ContextMenu::restore(const KConfigGroup &config)
 
     // everything below should only happen once, so check for it
     if (!m_runCommandAction) {
-        m_runCommandAction = new QAction(i18n("Run Command..."), this);
+        m_runCommandAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Run Command..."), this);
         m_runCommandAction->setIcon(QIcon::fromTheme("system-run"));
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
 
-        m_lockScreenAction = new QAction(i18n("Lock Screen"), this);
+        m_lockScreenAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Lock Screen"), this);
         m_lockScreenAction->setIcon(QIcon::fromTheme("system-lock-screen"));
         connect(m_lockScreenAction, SIGNAL(triggered(bool)), this, SLOT(lockScreen()));
 
-        m_logoutAction = new QAction(i18n("Leave..."), this);
+        m_logoutAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Leave..."), this);
         m_logoutAction->setIcon(QIcon::fromTheme("system-shutdown"));
         connect(m_logoutAction, SIGNAL(triggered(bool)), this, SLOT(startLogout()));
 
@@ -240,7 +240,7 @@ QWidget* ContextMenu::createConfigurationInterface(QWidget* parent)
     QWidget *widget = new QWidget(parent);
     QVBoxLayout *lay = new QVBoxLayout();
     widget->setLayout(lay);
-    widget->setWindowTitle(i18n("Configure Contextual Menu Plugin"));
+    widget->setWindowTitle(i18nc("plasma_containmentactions_contextmenu", "Configure Contextual Menu Plugin"));
     m_buttons = new QButtonGroup(widget);
     m_buttons->setExclusive(false);
 
@@ -250,14 +250,14 @@ QWidget* ContextMenu::createConfigurationInterface(QWidget* parent)
         if (name == "_context") {
             item = new QCheckBox(widget);
             //FIXME better text
-            item->setText(i18n("[Other Actions]"));
+            item->setText(i18nc("plasma_containmentactions_contextmenu", "[Other Actions]"));
         } else if (name == "_wallpaper") {
             item = new QCheckBox(widget);
-            item->setText(i18n("Wallpaper Actions"));
+            item->setText(i18nc("plasma_containmentactions_contextmenu", "Wallpaper Actions"));
             item->setIcon(QIcon::fromTheme("user-desktop"));
         } else if (name == "_sep1" || name =="_sep2" || name == "_sep3") {
             item = new QCheckBox(widget);
-            item->setText(i18n("[Separator]"));
+            item->setText(i18nc("plasma_containmentactions_contextmenu", "[Separator]"));
         } else {
             QAction *a = action(name);
             if (a) {

containmentactions/switchwindow/switch.cpp

@@ -56,7 +56,7 @@ QWidget* SwitchWindow::createConfigurationInterface(QWidget* parent)
 {
     QWidget *widget = new QWidget(parent);
     m_ui.setupUi(widget);
-    widget->setWindowTitle(i18n("Configure Switch Window Plugin"));
+    widget->setWindowTitle(i18nc("plasma_containmentactions_switchwindow", "Configure Switch Window Plugin"));
     switch (m_mode) {
         case AllFlat:
             m_ui.flatButton->setChecked(true);
@@ -124,7 +124,7 @@ void SwitchWindow::makeMenu()
     if (m_mode == CurrentDesktop) {
         int currentDesktop = KWindowSystem::currentDesktop();
 
-        QAction *a = new QAction(i18n("Windows"), this);
+        QAction *a = new QAction(i18nc("plasma_containmentactions_switchwindow", "Windows"), this);
         a->setSeparator(true);
         m_actions << a;
         m_actions << desktops.values(currentDesktop);
@@ -144,7 +144,7 @@ void SwitchWindow::makeMenu()
                 }
             }
             if (desktops.contains(-1)) {
-                QAction *a = new QAction(i18n("All Desktops"), this);
+                QAction *a = new QAction(i18nc("plasma_containmentactions_switchwindow", "All Desktops"), this);
                 a->setSeparator(true);
                 m_actions << a;
                 m_actions << desktops.values(-1);
@@ -164,9 +164,9 @@ void SwitchWindow::makeMenu()
                 }
             }
             if (desktops.contains(-1)) {
-                QMenu *subMenu = new QMenu(i18n("All Desktops"));
+                QMenu *subMenu = new QMenu(i18nc("plasma_containmentactions_switchwindow", "All Desktops"));
                 subMenu->addActions(desktops.values(-1));
-                QAction *a = new QAction(i18n("All Desktops"), this);
+                QAction *a = new QAction(i18nc("plasma_containmentactions_switchwindow", "All Desktops"), this);
                 a->setMenu(subMenu);
                 m_actions << a;
             }

shell/currentcontainmentactionsmodel.cpp

@@ -227,13 +227,16 @@ void CurrentContainmentActionsModel::showAbout(int row)
 
     KAboutData aboutData(info.name().toUtf8(),
             ki18n(info.name().toUtf8()).toString(),
-            info.version().toUtf8(), ki18n(info.comment().toUtf8()).toString(),
-            KAboutLicense::byKeyword(info.license()).key(), ki18n(QByteArray()).toString(), ki18n(QByteArray()).toString(), info.website().toLatin1(),
+            info.version().toUtf8(),
+            ki18n(info.comment().toUtf8()).toString(),
+            KAboutLicense::byKeyword(info.license()).key(),
+            QByteArray(),
+            QByteArray(), info.website().toLatin1(),
             info.email().toLatin1());
 
     aboutData.setProgramIconName(info.icon());
 
-    aboutData.addAuthor(ki18n(info.author().toUtf8()).toString(), ki18n(QByteArray()).toString(), info.email().toLatin1());
+    aboutData.addAuthor(ki18n(info.author().toUtf8()).toString(), QByteArray(), info.email().toLatin1());
 
     KAboutApplicationDialog *aboutDialog = new KAboutApplicationDialog(aboutData, qobject_cast<QWidget*>(parent()));
     aboutDialog->show();