summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-26 20:17:35 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-26 20:17:35 +0200
commit9ba0a2f4f54edb7147f5e63b12ba11c75e0e3d4a (patch)
tree6a03722fddc77e1db1321dcdbdaf79c62edee4d1 /redhat/tdebase
parent05e7179a7ebf530d123ec3c567381c17225686d7 (diff)
parent86909221f53fa1d7b58030054ee67f2bab53a630 (diff)
downloadtde-packaging-9ba0a2f4f54edb7147f5e63b12ba11c75e0e3d4a.tar.gz
tde-packaging-9ba0a2f4f54edb7147f5e63b12ba11c75e0e3d4a.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdebase')
-rw-r--r--redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch13
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec2
2 files changed, 12 insertions, 3 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch b/redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
index 503d1543e..cc361c712 100644
--- a/redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
+++ b/redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
@@ -1,5 +1,14 @@
---- trinity-tdebase-14.0.0~pre737+02bf1e69/kdesktop/krootwm.c.ORI 2013-07-07 19:52:01.913986986 +0200
-+++ trinity-tdebase-14.0.0~pre737+02bf1e69/kdesktop/krootwm.cc 2013-07-07 19:52:49.676516510 +0200
+--- tdebase/kdesktop/krootwm.cc.openterminalhere 2013-07-24 21:45:14.083030776 +0200
++++ tdebase/kdesktop/krootwm.cc 2013-07-26 17:37:34.561203115 +0200
+@@ -132,7 +132,7 @@
+ if (kapp->authorize("run_command"))
+ {
+ new TDEAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+- new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
++ new TDEAction(i18n("Open Terminal..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
+ m_actionCollection, "open_terminal" );
+ }
+
@@ -760,7 +760,7 @@
TDEConfigGroupSaver gs(TDEGlobal::config(), "General");
TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index e4dedd6d3..30ba711b8 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -78,7 +78,7 @@ Patch1: tdebase-14.0.0-open_terminal_here.patch
Patch2: tdebase-14.0.0-default_menu_icon.patch
## [kdebase/kcontrol] Adds FR translation for KCM ICC
Patch3: tdebase-14.0.0-displayconfig_translation.patch
-## [kdebase/kcontrol] Adds FR translation for KCM ICC
+## [kdebase/kcontrol] Adds default entries for Kickoff menu
Patch4: tdebase-14.0.0-kickoff_default_favs.patch
## [kdebase] Changes konsole default word separator
Patch5: tdebase-14.0.0-konsole_wordseps.patch