[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasma
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2008-11-02 17:38:55
Message-ID: 1225647535.724985.12012.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 879206 by aacid:

add context


 M  +1 -1      applet.cpp  
 M  +4 -4      containment.cpp  
 M  +1 -1      private/service_p.h  


--- trunk/KDE/kdebase/workspace/libs/plasma/applet.cpp #879205:879206
@@ -791,7 +791,7 @@
         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 {
--- trunk/KDE/kdebase/workspace/libs/plasma/containment.cpp #879205:879206
@@ -511,7 +511,7 @@
             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 @@
             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 @@
         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();
         }
--- trunk/KDE/kdebase/workspace/libs/plasma/private/service_p.h #879205:879206
@@ -44,7 +44,7 @@
 
     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();
     }
 };


[prev in list] [next in list] [prev in thread] [next in thread]