Git commit 18eb162f7c4bb659f8ba7909e2b0794b3ad6c526 by Luigi Toscano. Committed on 21/05/2023 at 22:10. Pushed by ltoscano into branch 'master'.
KCM docs: kcontrol5 -> kcontrol6 M +1 -1 docs/CMakeLists.txt D +0 -2 docs/kcontrol5/webshortcuts/CMakeLists.txt R +0 -0 docs/kcontrol6/CMakeLists.txt [from: docs/kcontrol5/CMakeLists.txt - 100% similarity] R +1 -1 docs/kcontrol6/cookies/CMakeLists.txt [from: docs/kcontrol5/cookies/CMakeLists.txt - 066% similarity] R +0 -0 docs/kcontrol6/cookies/index.docbook [from: docs/kcontrol5/cookies/index.docbook - 100% similarity] R +1 -1 docs/kcontrol6/netpref/CMakeLists.txt [from: docs/kcontrol5/netpref/CMakeLists.txt - 066% similarity] R +0 -0 docs/kcontrol6/netpref/index.docbook [from: docs/kcontrol5/netpref/index.docbook - 100% similarity] C +1 -1 docs/kcontrol6/proxy/CMakeLists.txt [from: docs/kcontrol5/proxy/CMakeLists.txt - 067% similarity] R +0 -0 docs/kcontrol6/proxy/index.docbook [from: docs/kcontrol5/proxy/index.docbook - 100% similarity] R +1 -1 docs/kcontrol6/smb/CMakeLists.txt [from: docs/kcontrol5/smb/CMakeLists.txt - 068% similarity] R +0 -0 docs/kcontrol6/smb/index.docbook [from: docs/kcontrol5/smb/index.docbook - 100% similarity] R +1 -1 docs/kcontrol6/trash/CMakeLists.txt [from: docs/kcontrol5/trash/CMakeLists.txt - 067% similarity] R +0 -0 docs/kcontrol6/trash/index.docbook [from: docs/kcontrol5/trash/index.docbook - 100% similarity] R +1 -1 docs/kcontrol6/webshortcuts/CMakeLists.txt [from: docs/kcontrol5/proxy/CMakeLists.txt - 064% similarity] R +0 -0 docs/kcontrol6/webshortcuts/index.docbook [from: docs/kcontrol5/webshortcuts/index.docbook - 100% similarity] M +1 -1 src/kcms/cookies/kcm_cookies.json M +1 -1 src/kcms/netpref/kcm_netpref.json M +1 -1 src/kcms/proxy/kcm_proxy.json M +1 -1 src/kcms/smb/kcm_smb.json M +1 -1 src/kcms/webshortcuts/kcm_webshortcuts.json M +1 -1 src/kioworkers/trash/kcmtrash.json https://invent.kde.org/frameworks/kio/commit/18eb162f7c4bb659f8ba7909e2b0794b3ad6c526 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 9601c047bd..f64bd571e0 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(kcookiejar5) add_subdirectory(kioworker6) -add_subdirectory(kcontrol5) +add_subdirectory(kcontrol6) diff --git a/docs/kcontrol5/webshortcuts/CMakeLists.txt b/docs/kcontrol5/webshortcuts/CMakeLists.txt deleted file mode 100644 index 08c73e76aa..0000000000 --- a/docs/kcontrol5/webshortcuts/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/webshortcuts) diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol6/CMakeLists.txt similarity index 100% rename from docs/kcontrol5/CMakeLists.txt rename to docs/kcontrol6/CMakeLists.txt diff --git a/docs/kcontrol5/cookies/CMakeLists.txt b/docs/kcontrol6/cookies/CMakeLists.txt similarity index 66% rename from docs/kcontrol5/cookies/CMakeLists.txt rename to docs/kcontrol6/cookies/CMakeLists.txt index 57fdb482ff..dd5bb6aef7 100644 --- a/docs/kcontrol5/cookies/CMakeLists.txt +++ b/docs/kcontrol6/cookies/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/cookies) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol6/cookies) diff --git a/docs/kcontrol5/cookies/index.docbook b/docs/kcontrol6/cookies/index.docbook similarity index 100% rename from docs/kcontrol5/cookies/index.docbook rename to docs/kcontrol6/cookies/index.docbook diff --git a/docs/kcontrol5/netpref/CMakeLists.txt b/docs/kcontrol6/netpref/CMakeLists.txt similarity index 66% rename from docs/kcontrol5/netpref/CMakeLists.txt rename to docs/kcontrol6/netpref/CMakeLists.txt index a7b34f7f4e..1f7485cfe7 100644 --- a/docs/kcontrol5/netpref/CMakeLists.txt +++ b/docs/kcontrol6/netpref/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/netpref) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol6/netpref) diff --git a/docs/kcontrol5/netpref/index.docbook b/docs/kcontrol6/netpref/index.docbook similarity index 100% rename from docs/kcontrol5/netpref/index.docbook rename to docs/kcontrol6/netpref/index.docbook diff --git a/docs/kcontrol5/proxy/CMakeLists.txt b/docs/kcontrol6/proxy/CMakeLists.txt similarity index 67% copy from docs/kcontrol5/proxy/CMakeLists.txt copy to docs/kcontrol6/proxy/CMakeLists.txt index 3c981d4a5d..5861413f7f 100644 --- a/docs/kcontrol5/proxy/CMakeLists.txt +++ b/docs/kcontrol6/proxy/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/proxy) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol6/proxy) diff --git a/docs/kcontrol5/proxy/index.docbook b/docs/kcontrol6/proxy/index.docbook similarity index 100% rename from docs/kcontrol5/proxy/index.docbook rename to docs/kcontrol6/proxy/index.docbook diff --git a/docs/kcontrol5/smb/CMakeLists.txt b/docs/kcontrol6/smb/CMakeLists.txt similarity index 68% rename from docs/kcontrol5/smb/CMakeLists.txt rename to docs/kcontrol6/smb/CMakeLists.txt index 8d04ee7fca..557477f2f3 100644 --- a/docs/kcontrol5/smb/CMakeLists.txt +++ b/docs/kcontrol6/smb/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/smb) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol6/smb) diff --git a/docs/kcontrol5/smb/index.docbook b/docs/kcontrol6/smb/index.docbook similarity index 100% rename from docs/kcontrol5/smb/index.docbook rename to docs/kcontrol6/smb/index.docbook diff --git a/docs/kcontrol5/trash/CMakeLists.txt b/docs/kcontrol6/trash/CMakeLists.txt similarity index 67% rename from docs/kcontrol5/trash/CMakeLists.txt rename to docs/kcontrol6/trash/CMakeLists.txt index d9bbf7a5cc..1cd7a3c87c 100644 --- a/docs/kcontrol5/trash/CMakeLists.txt +++ b/docs/kcontrol6/trash/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/trash) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol6/trash) diff --git a/docs/kcontrol5/trash/index.docbook b/docs/kcontrol6/trash/index.docbook similarity index 100% rename from docs/kcontrol5/trash/index.docbook rename to docs/kcontrol6/trash/index.docbook diff --git a/docs/kcontrol5/proxy/CMakeLists.txt b/docs/kcontrol6/webshortcuts/CMakeLists.txt similarity index 64% rename from docs/kcontrol5/proxy/CMakeLists.txt rename to docs/kcontrol6/webshortcuts/CMakeLists.txt index 3c981d4a5d..234007ac6b 100644 --- a/docs/kcontrol5/proxy/CMakeLists.txt +++ b/docs/kcontrol6/webshortcuts/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/proxy) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol6/webshortcuts) diff --git a/docs/kcontrol5/webshortcuts/index.docbook b/docs/kcontrol6/webshortcuts/index.docbook similarity index 100% rename from docs/kcontrol5/webshortcuts/index.docbook rename to docs/kcontrol6/webshortcuts/index.docbook diff --git a/src/kcms/cookies/kcm_cookies.json b/src/kcms/cookies/kcm_cookies.json index 3152ca3bfe..41550e3b15 100644 --- a/src/kcms/cookies/kcm_cookies.json +++ b/src/kcms/cookies/kcm_cookies.json @@ -57,7 +57,7 @@ "Name[x-test]": "xxCookiesxx", "Name[zh_TW]": "Cookies" }, - "X-DocPath": "kcontrol5/cookies/index.html", + "X-DocPath": "kcontrol6/cookies/index.html", "X-KDE-Keywords": "Cookies,Browsing,Internet,WWW,Network,Policy,Domains", "X-KDE-Keywords[ar]": "كعكات,تصفح,انترنت,www,شبكة,سياسة,نطاقات", "X-KDE-Keywords[az]": "Kukilər, Baxış, İnternet, WWW,Şəbəkə,Davranış, Xidmətlər", diff --git a/src/kcms/netpref/kcm_netpref.json b/src/kcms/netpref/kcm_netpref.json index 6c8e58bcdf..82226ac77b 100644 --- a/src/kcms/netpref/kcm_netpref.json +++ b/src/kcms/netpref/kcm_netpref.json @@ -57,7 +57,7 @@ "Name[x-test]": "xxConnection Preferencesxx", "Name[zh_TW]": "連線設定" }, - "X-DocPath": "kcontrol5/netpref/index.html", + "X-DocPath": "kcontrol6/netpref/index.html", "X-KDE-Keywords": "timeout,iopref,netpref,network preferences,ftp", "X-KDE-Keywords[ar]": "وقت المهلة,iopref,netpref,تفضيلات الشبكة,ftp", "X-KDE-Keywords[az]": "timeout,iopref,netpref,network preferences,ftp", diff --git a/src/kcms/proxy/kcm_proxy.json b/src/kcms/proxy/kcm_proxy.json index e823629891..06151a8e6a 100644 --- a/src/kcms/proxy/kcm_proxy.json +++ b/src/kcms/proxy/kcm_proxy.json @@ -58,7 +58,7 @@ "Name[x-test]": "xxProxyxx", "Name[zh_TW]": "代理伺服器" }, - "X-DocPath": "kcontrol5/proxy/index.html", + "X-DocPath": "kcontrol6/proxy/index.html", "X-KDE-Keywords": "Proxy,Proxy server,Firewall,Squid", "X-KDE-Keywords[ar]": "وسيط,خادم وسيط,جدار حماية,سكود", "X-KDE-Keywords[az]": "Proxy,Proxy server,Firewall,Squid", diff --git a/src/kcms/smb/kcm_smb.json b/src/kcms/smb/kcm_smb.json index 1d8b915519..da24ca7a8b 100644 --- a/src/kcms/smb/kcm_smb.json +++ b/src/kcms/smb/kcm_smb.json @@ -58,7 +58,7 @@ "Name[x-test]": "xxWindows Sharesxx", "Name[zh_TW]": "Windows 共享硬碟" }, - "X-DocPath": "kcontrol5/smb/index.html", + "X-DocPath": "kcontrol6/smb/index.html", "X-KDE-Keywords": "SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords", "X-KDE-Keywords[ar]": "SMB,سامبا,زبون سامبا,شبكة ويندز,شبكة محلية,شبكة,الجوار,خادم,نشر,ويندوز,مشاركة,ولوج,كلمات سر", "X-KDE-Keywords[az]": "SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords SMB, SAMBA, SMB müştəri, Windows şəbəkəsi, LAN, Şəbəkə, qonşuluq, Server,Yayım, WINS, Paylaş, Giriş, Şifrələr", diff --git a/src/kcms/webshortcuts/kcm_webshortcuts.json b/src/kcms/webshortcuts/kcm_webshortcuts.json index c59a85ea73..ba208eca12 100644 --- a/src/kcms/webshortcuts/kcm_webshortcuts.json +++ b/src/kcms/webshortcuts/kcm_webshortcuts.json @@ -58,7 +58,7 @@ "Name[x-test]": "xxWeb Search Keywordsxx", "Name[zh_TW]": "網路搜尋關鍵字" }, - "X-DocPath": "kcontrol5/webshortcuts/index.html", + "X-DocPath": "kcontrol6/webshortcuts/index.html", "X-KDE-Keywords": "Web Search Keywords,Web Search,Search,Keyword,Web Shortcuts,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts", "X-KDE-Keywords[ar]": "الكلمات الأساسية لبحث الويب,بحث الويب,البحث,الكلمات الرئيسية,اختصارات الويب,التصفح,WWW ,الإنترنت,مصفيات الإنترنت,الشبكة,محركات البحث,الاختصارات", "X-KDE-Keywords[az]": "Web Shortcuts,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts İnternetdə axtarış açar sözləri, Tarama, WWW, İnternet, İnternet Filtrləri, Şəbəkə, Axtarış motorları,Qısa yollar", diff --git a/src/kioworkers/trash/kcmtrash.json b/src/kioworkers/trash/kcmtrash.json index 2ddab536b7..82176042fc 100644 --- a/src/kioworkers/trash/kcmtrash.json +++ b/src/kioworkers/trash/kcmtrash.json @@ -58,7 +58,7 @@ "Name[x-test]": "xxTrashxx", "Name[zh_TW]": "垃圾桶" }, - "X-DocPath": "kcontrol5/trash/index.html", + "X-DocPath": "kcontrol6/trash/index.html", "X-KDE-Keywords": "trash", "X-KDE-Keywords[ar]": "مهملات", "X-KDE-Keywords[az]": "səbət",
