merge

4 files changed, 14 insertions, 14 deletions

diff --git a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
index d6c1b3a1f..28d1bba41 100644
--- a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
+++ b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
@@ -16,18 +16,18 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-out.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-out.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png
 debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop
diff --git a/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install b/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install
index d6c1b3a1f..28d1bba41 100644
--- a/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install
+++ b/debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install
@@ -16,18 +16,18 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-out.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-out.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png
 debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index 607457c94..d2ff6732f 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
@@ -3,8 +3,8 @@ index f4a363d..f990394 100644
 --- a/tdeprint/printmgr/printers.desktop
 +++ b/tdeprint/printmgr/printers.desktop
 @@ -233,4 +233,4 @@ Keywords[zh_CN]=print;printer;printing management;打印;打印机;打印管理
- Keywords[zh_TW]=print;printer;printing management;列印;印表機;列印管理
- Keywords[zu]=shicilela;umshicileli;abaphathi boshicilelo
+ Keywords[zh_TW]=print;printer;printing management;列印;印表機;列印管理;
+ Keywords[zu]=shicilela;umshicileli;abaphathi boshicilelo;
  
 -Categories=Qt;TDE;X-TDE-settings-hardware;Settings;
 +Categories=Qt;TDE;X-TDE-settings-hardware;
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
index d6c1b3a1f..28d1bba41 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
+++ b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
@@ -16,18 +16,18 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-out.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-out.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png
 debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop