diff --git a/acinclude.m4 b/acinclude.m4 index 103e956..ea3168e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -489,7 +489,7 @@ if test "$1" = "default"; then kde_widgetdir='\${libdir}/trinity/plugins/designer' fi if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/kde' + xdg_appsdir='\${datadir}/applications/tde' fi if test -z "$xdg_menudir"; then xdg_menudir='\${sysconfdir}/xdg/menus' diff --git a/aclocal.m4 b/aclocal.m4 index f758d52..6e06bb7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -501,7 +501,7 @@ if test "$1" = "default"; then kde_widgetdir='\${libdir}/kde3/plugins/designer' fi if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/kde' + xdg_appsdir='\${datadir}/applications/tde' fi if test -z "$xdg_menudir"; then xdg_menudir='\${sysconfdir}/xdg/menus' diff --git a/admin b/admin index 06098ef..4af57bf 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a +Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0 diff --git a/apps/ktorrent/ktorrent.desktop b/apps/ktorrent/ktorrent.desktop index b1ab60d..a5ae848 100644 --- a/apps/ktorrent/ktorrent.desktop +++ b/apps/ktorrent/ktorrent.desktop @@ -82,4 +82,4 @@ Comment[xx]=xxA BitTorrent program for TDExx Comment[zh_CN]=一个 TDE 的 BitTorrent 程序 Comment[zh_TW]=TDE 的 BitTorrent 程式 Terminal=false -Categories=Qt;KDE;Network;FileTransfer; +Categories=Qt;TDE;Network;FileTransfer; diff --git a/apps/ktorrent/ktorrentplugin.desktop b/apps/ktorrent/ktorrentplugin.desktop index 40cfe9c..29436c8 100644 --- a/apps/ktorrent/ktorrentplugin.desktop +++ b/apps/ktorrent/ktorrentplugin.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=ServiceType -X-KDE-ServiceType=KTorrent/Plugin +X-TDE-ServiceType=KTorrent/Plugin Name=KTorrent Plugin Name[ar]=قابس KTorrent Name[bg]=Приставка за KTorrent diff --git a/apps/ktorrent/x-bittorrent.desktop b/apps/ktorrent/x-bittorrent.desktop index 2db2de8..7fba36f 100644 --- a/apps/ktorrent/x-bittorrent.desktop +++ b/apps/ktorrent/x-bittorrent.desktop @@ -36,4 +36,4 @@ MimeType=application/x-bittorrent Icon=torrent Type=MimeType Patterns=*.torrent;*.tor -X-KDE-AutoEmbed=false +X-TDE-AutoEmbed=false diff --git a/cmake b/cmake index e47cc63..d2f658c 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc +Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280 diff --git a/plugins/infowidget/ktinfowidgetplugin.desktop b/plugins/infowidget/ktinfowidgetplugin.desktop index 535f90c..5889655 100644 --- a/plugins/infowidget/ktinfowidgetplugin.desktop +++ b/plugins/infowidget/ktinfowidgetplugin.desktop @@ -26,4 +26,4 @@ Name[zh_CN]=搜索插件 Name[zh_TW]=搜尋外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktinfowidgetplugin +X-TDE-Library=ktinfowidgetplugin diff --git a/plugins/ipfilter/ktipfilterplugin.desktop b/plugins/ipfilter/ktipfilterplugin.desktop index 3c442a9..c92041b 100644 --- a/plugins/ipfilter/ktipfilterplugin.desktop +++ b/plugins/ipfilter/ktipfilterplugin.desktop @@ -53,4 +53,4 @@ Comment[zh_CN]=KTorrent 的 IP 过滤器插件 Comment[zh_TW]=KTorrent IP 過濾器外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktipfilterplugin +X-TDE-Library=ktipfilterplugin diff --git a/plugins/logviewer/ktlogviewerplugin.desktop b/plugins/logviewer/ktlogviewerplugin.desktop index ba2e625..7d20756 100644 --- a/plugins/logviewer/ktlogviewerplugin.desktop +++ b/plugins/logviewer/ktlogviewerplugin.desktop @@ -23,4 +23,4 @@ Name[zh_CN]=日志查看器插件 Name[zh_TW]=紀錄檢視器外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktlogviewerplugin +X-TDE-Library=ktlogviewerplugin diff --git a/plugins/partfileimport/ktpartfileimportplugin.desktop b/plugins/partfileimport/ktpartfileimportplugin.desktop index 5b28fe0..8fc7fab 100644 --- a/plugins/partfileimport/ktpartfileimportplugin.desktop +++ b/plugins/partfileimport/ktpartfileimportplugin.desktop @@ -22,4 +22,4 @@ Name[zh_CN]=部分文件导入插件 Name[zh_TW]=PartialFileImport外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktpartfileimportplugin +X-TDE-Library=ktpartfileimportplugin diff --git a/plugins/rssfeed/ktrssfeedplugin.desktop b/plugins/rssfeed/ktrssfeedplugin.desktop index a26c08b..b76bda1 100644 --- a/plugins/rssfeed/ktrssfeedplugin.desktop +++ b/plugins/rssfeed/ktrssfeedplugin.desktop @@ -19,4 +19,4 @@ Name[xx]=xxRssFeedPluginxx Name[zh_CN]=RSS 种子插件 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktrssfeedplugin +X-TDE-Library=ktrssfeedplugin diff --git a/plugins/scanfolder/ktscanfolderplugin.desktop b/plugins/scanfolder/ktscanfolderplugin.desktop index b6180de..af2afeb 100644 --- a/plugins/scanfolder/ktscanfolderplugin.desktop +++ b/plugins/scanfolder/ktscanfolderplugin.desktop @@ -23,4 +23,4 @@ Name[zh_CN]=扫描文件夹插件 Name[zh_TW]=掃描資料夾外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktscanfolderplugin +X-TDE-Library=ktscanfolderplugin diff --git a/plugins/scheduler/ktschedulerplugin.desktop b/plugins/scheduler/ktschedulerplugin.desktop index c208cb3..32cbf1b 100644 --- a/plugins/scheduler/ktschedulerplugin.desktop +++ b/plugins/scheduler/ktschedulerplugin.desktop @@ -23,4 +23,4 @@ Name[zh_CN]=带宽规划器插件 Name[zh_TW]=排程器外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktschedulerplugin +X-TDE-Library=ktschedulerplugin diff --git a/plugins/search/ktsearchplugin.desktop b/plugins/search/ktsearchplugin.desktop index 0210135..9be9e88 100644 --- a/plugins/search/ktsearchplugin.desktop +++ b/plugins/search/ktsearchplugin.desktop @@ -57,4 +57,4 @@ Comment[zh_CN]=KTorrent 的搜索插件 Comment[zh_TW]=KTorrent 搜尋外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktsearchplugin +X-TDE-Library=ktsearchplugin diff --git a/plugins/stats/ktstatsplugin.desktop b/plugins/stats/ktstatsplugin.desktop index 79e620f..0ac05aa 100644 --- a/plugins/stats/ktstatsplugin.desktop +++ b/plugins/stats/ktstatsplugin.desktop @@ -21,4 +21,4 @@ Name[zh_CN]=统计插件 Comment= Comment[xx]=xxxx ServiceTypes=KTorrent/Plugin -X-KDE-Library=ktstatsplugin +X-TDE-Library=ktstatsplugin diff --git a/plugins/upnp/ktupnpplugin.desktop b/plugins/upnp/ktupnpplugin.desktop index 67948d7..0347fef 100644 --- a/plugins/upnp/ktupnpplugin.desktop +++ b/plugins/upnp/ktupnpplugin.desktop @@ -23,4 +23,4 @@ Name[zh_CN]=UPnP 插件 Name[zh_TW]=UPnP外掛程式 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktupnpplugin +X-TDE-Library=ktupnpplugin diff --git a/plugins/webinterface/ktwebinterfaceplugin.desktop b/plugins/webinterface/ktwebinterfaceplugin.desktop index f1fc92b..edc030d 100644 --- a/plugins/webinterface/ktwebinterfaceplugin.desktop +++ b/plugins/webinterface/ktwebinterfaceplugin.desktop @@ -19,4 +19,4 @@ Name[xx]=xxWebInterfacexx Name[zh_CN]=Web 界面 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktwebinterfaceplugin +X-TDE-Library=ktwebinterfaceplugin diff --git a/plugins/zeroconf/ktzeroconfplugin.desktop b/plugins/zeroconf/ktzeroconfplugin.desktop index caf68e1..5211752 100644 --- a/plugins/zeroconf/ktzeroconfplugin.desktop +++ b/plugins/zeroconf/ktzeroconfplugin.desktop @@ -19,4 +19,4 @@ Name[xx]=xxZeroConfPluginxx Name[zh_CN]=ZeroConf 插件 ServiceTypes=KTorrent/Plugin Type=Service -X-KDE-Library=ktzeroconfplugin +X-TDE-Library=ktzeroconfplugin