From 45edd84dfcff2a7706ad5927bbb310a1b94d4cf4 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 2 Nov 2008 17:38:52 +0000 Subject: [PATCH] add context svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=879206 --- applet.cpp | 2 +- containment.cpp | 8 ++++---- private/service_p.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applet.cpp b/applet.cpp index 8f98d4ad5..6723b2e61 100644 --- a/applet.cpp +++ b/applet.cpp @@ -791,7 +791,7 @@ void Applet::flushPendingConstraintsEvents() closeApplet->setEnabled(unlocked); closeApplet->setVisible(unlocked); closeApplet->setShortcutContext(Qt::WidgetShortcut); //don't clash with other views - closeApplet->setText(i18n("Remove this %1", name())); + closeApplet->setText(i18nc("%1 is the name of the applet", "Remove this %1", name())); if (isContainment()) { closeApplet->setShortcut(QKeySequence("ctrl+shift+r")); } else { diff --git a/containment.cpp b/containment.cpp index c9ffecf4f..fea415f61 100644 --- a/containment.cpp +++ b/containment.cpp @@ -511,7 +511,7 @@ bool ContainmentPrivate::showContextMenu(const QPointF &point, QMenu *containmentActionMenu = &desktopMenu; if (!actions.isEmpty() && containmentActions.count() > 2) { - containmentActionMenu = new KMenu(i18n("%1 Options", q->name()), &desktopMenu); + containmentActionMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu); desktopMenu.addMenu(containmentActionMenu); } @@ -530,7 +530,7 @@ bool ContainmentPrivate::showContextMenu(const QPointF &point, QAction *closeApplet = applet->d->actions.action("remove"); if (!closeApplet) { //unlikely but not impossible kDebug() << "no remove action!!!!!!!!"; - closeApplet = new QAction(i18n("Remove this %1", applet->name()), &desktopMenu); + closeApplet = new QAction(i18nc("%1 is the name of the applet", "Remove this %1", applet->name()), &desktopMenu); closeApplet->setIcon(KIcon("edit-delete")); QObject::connect(closeApplet, SIGNAL(triggered(bool)), applet, SLOT(destroy())); } @@ -1377,8 +1377,8 @@ void Containment::destroy(bool confirm) if (!confirm || KMessageBox::warningContinueCancel( view(), - i18n("Do you really want to remove this %1?", name()), - i18n("Remove %1", name()), KStandardGuiItem::remove()) == KMessageBox::Continue) { + i18nc("%1 is the name of the containment", "Do you really want to remove this %1?", name()), + i18nc("@title:window %1 is the name of the containment", "Remove %1", name()), KStandardGuiItem::remove()) == KMessageBox::Continue) { //clearApplets(); Applet::destroy(); } diff --git a/private/service_p.h b/private/service_p.h index 7a5964520..d7208020d 100644 --- a/private/service_p.h +++ b/private/service_p.h @@ -44,7 +44,7 @@ public: void start() { - setErrorText(i18n("Invalid (null) service, can not perform any operations.")); + setErrorText(i18nc("Error message, tried to start an invalid service", "Invalid (null) service, can not perform any operations.")); emitResult(); } };