summaryrefslogtreecommitdiffstats
path: root/kcontrol/taskbar
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2014-02-19 09:57:35 -0600
committerDarrell Anderson <[email protected]>2014-02-19 09:57:35 -0600
commit05fdac11bb0e221bfd023b70c3f8ca7a3b9c1a8c (patch)
tree88758f63aa59d60283a087cc4ccf4336fe2f4aee /kcontrol/taskbar
parent98bc8699739c1eb1dffc1c4efeaa9913ae7d4550 (diff)
downloadtdebase-05fdac11bb0e221bfd023b70c3f8ca7a3b9c1a8c.tar.gz
tdebase-05fdac11bb0e221bfd023b70c3f8ca7a3b9c1a8c.zip
Merge kcontrol/panel help handbooks into kicker help handbook, delete
duplicate kcontrol/panel handbooks, and update respective *.desktop files.
Diffstat (limited to 'kcontrol/taskbar')
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp2
-rw-r--r--kcontrol/taskbar/kcmtaskbar.desktop3
2 files changed, 2 insertions, 3 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 788187ca7..80c7bf87e 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -104,7 +104,7 @@ const TQStringList& TaskbarConfig::actionList()
<< I18N_NOOP("Activate, Raise or Minimize Task")
<< I18N_NOOP("Activate Task") << I18N_NOOP("Raise Task")
<< I18N_NOOP("Lower Task") << I18N_NOOP("Minimize Task")
- << I18N_NOOP("To Current Desktop")
+ << I18N_NOOP("Move To Current Desktop")
<< I18N_NOOP("Close Task") );
return list;
}
diff --git a/kcontrol/taskbar/kcmtaskbar.desktop b/kcontrol/taskbar/kcmtaskbar.desktop
index 91d116d89..e7afb2123 100644
--- a/kcontrol/taskbar/kcmtaskbar.desktop
+++ b/kcontrol/taskbar/kcmtaskbar.desktop
@@ -1,10 +1,9 @@
[Desktop Entry]
Icon=kmenu
Type=Application
-DocPath=kcontrol/kcmtaskbar/index.html
+DocPath=kicker/taskbar-settings.html
Exec=tdecmshell kcmtaskbar
-
X-TDE-Library=taskbar
X-TDE-FactoryName=taskbar
X-TDE-ParentApp=kcontrol