From 0d23518234454ac5a665345c820a1c9d6ac62fdeecc7d0bdc50dd726c952bdbb Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 20 Mar 2015 01:52:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/bluedevil5?expand=0&rev=17 --- sync-with-master.patch | 1259 ++++------------------------------------ 1 file changed, 116 insertions(+), 1143 deletions(-) diff --git a/sync-with-master.patch b/sync-with-master.patch index c3b5ef3..54d50a9 100644 --- a/sync-with-master.patch +++ b/sync-with-master.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e1f264..98a8c70 100644 +index 002f464148c98734cc58617135b8307a9c41d2b1..c5f2a2701a9e7d8955307446dab6ba600c43ae6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ @@ -20,7 +20,7 @@ index 9e1f264..98a8c70 100644 Core Widgets diff --git a/README b/README -index b701b77..b819ed7 100644 +index b701b77d822dbc5509b4972faaa158e6c670e44f..b819ed7f170473ac0f3c232c5946b6b7a9d80ecf 100644 --- a/README +++ b/README @@ -1,14 +1,11 @@ @@ -47,8 +47,8 @@ index b701b77..b819ed7 100644 + -pulseaudio-module-bluetooth + -Be able to connect A2DP profile diff --git a/src/XmlMessages.sh b/src/XmlMessages.sh -new file mode 100755 -index 0000000..05651f5 +new file mode 100644 +index 0000000000000000000000000000000000000000..05651f53259aaee2876b97570a8ba47e5f6d4cf5 --- /dev/null +++ b/src/XmlMessages.sh @@ -0,0 +1,22 @@ @@ -75,7 +75,7 @@ index 0000000..05651f5 + esac +} diff --git a/src/bluedevil-mime.xml b/src/bluedevil-mime.xml -index 669147d..dc4af15 100644 +index 669147d204d1be05a40a0c9d3b10128fc02b1c45..dc4af15e8ac92684bfab6426aa939922cb80c97b 100644 --- a/src/bluedevil-mime.xml +++ b/src/bluedevil-mime.xml @@ -17,27 +17,195 @@ Notes: @@ -275,232 +275,10 @@ index 669147d..dc4af15 100644 diff --git a/src/bluedevil.notifyrc b/src/bluedevil.notifyrc -index bda24b0..81433dd 100644 +index 27b45743d42597b033158e51e5fdebbd8e32e4f4..4082c625e22c3c8555f0cd587d7634c9e8a720f5 100644 --- a/src/bluedevil.notifyrc +++ b/src/bluedevil.notifyrc -@@ -1,16 +1,26 @@ - [Global] - IconName=preferences-system-bluetooth - Comment=Bluetooth system -+Comment[ast]=Sistema Bluetooth -+Comment[bs]=Bluetooth sistem - Comment[ca]=Sistema Bluetooth - Comment[cs]=Systém Bluetooth - Comment[de]=Bluetooth-System -+Comment[el]=Σύστημα Bluetooth - Comment[en_GB]=Bluetooth system - Comment[es]=Sistema Bluetooth -+Comment[et]=Bluetoothi süsteem - Comment[fi]=Bluetooth-järjestelmä - Comment[fr]=Système Bluetooth - Comment[it]=Sistema Bluetooth -+Comment[ja]=Bluetooth システム -+Comment[kk]=Bluetooth жүйесі -+Comment[ko]=블루투스 시스템 -+Comment[lt]=Bluetooth -+Comment[mr]=ब्लूटूथ प्रणाली - Comment[nb]=Blåtann-system - Comment[nl]=Bluetooth-systeem -+Comment[pa]=ਬਲਿਊਟੁੱਥ ਸਿਸਟਮ - Comment[pl]=System Bluetooth - Comment[pt]=Sistema Bluetooth - Comment[pt_BR]=Sistema Bluetooth -@@ -21,20 +31,31 @@ Comment[sr@ijekavian]=Блутут систем - Comment[sr@ijekavianlatin]=Bluetooth sistem - Comment[sr@latin]=Bluetooth sistem - Comment[sv]=Blåtandsystem -+Comment[tr]=Bluetooth sistemi - Comment[uk]=Система Bluetooth - Comment[x-test]=xxBluetooth systemxx - Comment[zh_CN]=蓝牙系统 -+Comment[zh_TW]=藍牙系統 - Name=Bluetooth -+Name[bs]=Blutut - Name[ca]=Bluetooth - Name[cs]=Bluetooth - Name[de]=Bluetooth -+Name[el]=Bluetooth - Name[en_GB]=Bluetooth - Name[es]=Bluetooth -+Name[et]=Bluetooth - Name[fi]=Bluetooth - Name[fr]=Bluetooth - Name[it]=Bluetooth -+Name[ja]=Bluetooth -+Name[kk]=Bluetooth -+Name[ko]=블루투스 -+Name[lt]=Bluetooth -+Name[mr]=ब्लूटूथ - Name[nb]=Blåtann - Name[nl]=Bluetooth -+Name[pa]=ਬਲਿਊਟੁੱਥ - Name[pl]=Bluetooth - Name[pt]=Bluetooth - Name[pt_BR]=Bluetooth -@@ -45,18 +66,23 @@ Name[sr@ijekavian]=Блутут - Name[sr@ijekavianlatin]=Bluetooth - Name[sr@latin]=Bluetooth - Name[sv]=Blåtand -+Name[tr]=Bluetooth - Name[uk]=Bluetooth - Name[x-test]=xxBluetoothxx - Name[zh_CN]=蓝牙 -+Name[zh_TW]=藍牙 - Ignore=true - - [Event/bluedevilAuthorize] - Name=Authorization Requested -+Name[bs]=Zahtijeva odobrenje - Name[ca]=Sol·licitud d'autorització - Name[cs]=Je vyžadováno udělení oprávnění - Name[de]=Autorisierung gefordert -+Name[el]=Απαιτείται ταυτοποίηση - Name[en_GB]=Authorisation Requested - Name[es]=Se ha solicitado autorización -+Name[et]=Autentimise nõue - Name[fi]=Valtuutusta pyydetty - Name[fr]=Autorisation demandée - Name[it]=Richiesta autorizzazione -@@ -72,15 +98,20 @@ Name[sr@ijekavian]=Неопходно овлашћивање - Name[sr@ijekavianlatin]=Neophodno ovlašćivanje - Name[sr@latin]=Neophodno ovlašćivanje - Name[sv]=Behörighet begärd -+Name[tr]=Yetkilendirme Gerekli - Name[uk]=Слід пройти розпізнавання - Name[x-test]=xxAuthorization Requestedxx - Name[zh_CN]=要求认证 -+Name[zh_TW]=請求認證 - Comment=A device wants to connect -+Comment[bs]=Uređaj se zeli konektovati - Comment[ca]=Un dispositiu es vol connectar - Comment[cs]=Zařízení se chce připojit - Comment[de]=Ein Gerät möchte sich verbinden -+Comment[el]=Μία συσκευή επιθυμεί να συνδεθεί - Comment[en_GB]=A device wants to connect --Comment[es]=Un dispositivo quiere conectarse -+Comment[es]=Un dispositivo desea conectarse -+Comment[et]=Seade soovib ühendust luua - Comment[fi]=Laite haluaa ottaa yhteyden - Comment[fr]=Un périphérique veut se connecter - Comment[it]=Un dispositivo vuole connettersi -@@ -96,18 +127,23 @@ Comment[sr@ijekavian]=Уређај жели да се повеже - Comment[sr@ijekavianlatin]=Uređaj želi da se poveže - Comment[sr@latin]=Uređaj želi da se poveže - Comment[sv]=En enhet vill ansluta -+Comment[tr]=Bir aygıt bağlanmak istiyor - Comment[uk]=Отримано запит щодо з’єднання пристрою з комп’ютером - Comment[x-test]=xxA device wants to connectxx - Comment[zh_CN]=一个设备想要连接 -+Comment[zh_TW]=某個裝置希望能與您連線 - Action=Popup - - [Event/bluedevilConfirmModechange] - Name=Confirm Mode Change -+Name[bs]=Povrdi promijene moda - Name[ca]=Confirmació del canvi de mode - Name[cs]=Potvrdit změnu režimu - Name[de]=Moduswechsel bestätigen -+Name[el]=Επιβεβαίωση αλλαγής λειτουργίας - Name[en_GB]=Confirm Mode Change - Name[es]=Confirmar el cambio de modo -+Name[et]=Režiimimuutuse kinnitus - Name[fi]=Vahvistan tilan vaihto - Name[fr]=Confirmer le changement de mode - Name[it]=Conferma cambio di modalità -@@ -123,13 +159,17 @@ Name[sr@ijekavian]=Потврди промену режима - Name[sr@ijekavianlatin]=Potvrdi promenu režima - Name[sr@latin]=Potvrdi promenu režima - Name[sv]=Bekräfta lägesändring -+Name[tr]=Kip Değişikliğini Onayla - Name[uk]=Підтвердження зміни режиму - Name[x-test]=xxConfirm Mode Changexx - Name[zh_CN]=确认模式变更 -+Name[zh_TW]=確認模式變更 - Comment=Bluetooth mode is about to be changed (normal to flight for example) -+Comment[bs]=Režim blututa će biti promijenjen (npr. s normalnog na ljetni) - Comment[ca]=El mode Bluetooth és a punt de canviar (de mode normal a mode avió per exemple) - Comment[cs]=Bude změněn režim Bluetooth (např. Normální na V letadle) - Comment[de]=Der Bluetooth-Modus ist im Begriff, sich zu ändern (z. B. von normal auf Flugzeugmodus) -+Comment[el]=Η λειτουργία του Bluetooth πρόκειται να αλλάξει (π.χ. από κανονική σε πτήσης) - Comment[en_GB]=Bluetooth mode is about to be changed (normal to flight for example) - Comment[es]=El modo Bluetooth está a punto de cambiar (de normal a vuelo, por ejemplo) - Comment[fi]=Bluetooth-tilaa muutetaan (esim. tavallisesta lentokonetilaksi) -@@ -147,23 +187,31 @@ Comment[sr@ijekavian]=Режим блутута ће бити промијење - Comment[sr@ijekavianlatin]=Režim Bluetootha će biti promijenjen (npr. s normalnog na ljetni) - Comment[sr@latin]=Režim Bluetootha će biti promenjen (npr. s normalnog na letni) - Comment[sv]=Blåtandläget ska just ändras (exempelvis från normal till flygning) -+Comment[th]=โหมดของบลูทูทจะถูกเปลี่ยนโหมด (เช่น จากโหมดปกติเป็นโหมดไฟลท์ เป็นต้น) -+Comment[tr]=Bluetooth kipi değiştirilmek üzere (örn. normal -> uçuş kipi) -+Comment[ug]=كۆكچىش ھالىتى ئۆزگەرتىلدى(مەسىلەن: نورمال -› ئۈچۈشقا) - Comment[uk]=Зміна режиму роботи Bluetooth (наприклад, зі звичайного на автономний) - Comment[x-test]=xxBluetooth mode is about to be changed (normal to flight for example)xx - Comment[zh_CN]=蓝牙模式即将更改(例如从正常变到飞行模式) -+Comment[zh_TW]=即將改變藍牙模式（例如從一般模式轉換為飛航模式） - Action=Popup - - [Event/bluedevilRequestConfirmation] - Name=Confirm PIN -+Name[bs]=Potvrdi pin - Name[ca]=Confirmació del PIN - Name[cs]=Potvrdit PIN - Name[de]=PIN bestätigen -+Name[el]=Επιβεβαίωση PIN - Name[en_GB]=Confirm PIN - Name[es]=Confirmar PIN -+Name[et]=PIN-i kinnitus - Name[fi]=Vahvista PIN - Name[fr]=Confirmer le code « PIN » - Name[it]=Conferma PIN - Name[nb]=Bekreft PIN - Name[nl]=PIN bevestigen -+Name[pa]=ਤਸਦੀਕ ਪਿਨ - Name[pl]=Potwierdź numer PIN - Name[pt]=Confirmar o PIN - Name[pt_BR]=Confirmar o PIN -@@ -174,15 +222,20 @@ Name[sr@ijekavian]=Потврди ПИН - Name[sr@ijekavianlatin]=Potvrdi PIN - Name[sr@latin]=Potvrdi PIN - Name[sv]=Bekräfta PIN-kod -+Name[tr]=PIN'i Onaylayın - Name[uk]=Підтвердження PIN - Name[x-test]=xxConfirm PINxx - Name[zh_CN]=确认 PIN -+Name[zh_TW]=確認 PIN 碼 - Comment=Confirm a device request using matching PINs -+Comment[bs]=Potvrdi zahtjev uređaja koristeci odgovarajuce pinove - Comment[ca]=Confirma una sol·licitud d'un dispositiu usant PIN que coincideixin - Comment[cs]=Potvrďte požadavek zařízení použitím odpovídajících PINů - Comment[de]=Eine Geräteanforderung mit passenden PINs bestätigen -+Comment[el]=Επιβεβαίωση αίτησης συσκευής που χρησιμοποιεί ταιριαστά PIN - Comment[en_GB]=Confirm a device request using matching PINs --Comment[es]=Confirmar la solicitud de un dispositivo usando un PIN coincidente -+Comment[es]=Confirmar la petición de un dispositivo usando PIN emparejados -+Comment[et]=Seadme nõude kinnitamine sobivate PIN-idega - Comment[fi]=Vahvista laitepyyntö käyttämällä samoja PIN-lukuja - Comment[fr]=Confirme une demande d'un périphérique utilisant une correspondance de codes « PIN » - Comment[it]=Conferma la richiesta di un dispositivo usando PIN corrispondenti -@@ -198,16 +251,20 @@ Comment[sr@ijekavian]=Потврдите захтев уређаја одгов - Comment[sr@ijekavianlatin]=Potvrdite zahtev uređaja odgovarajućim PIN‑om - Comment[sr@latin]=Potvrdite zahtev uređaja odgovarajućim PIN‑om - Comment[sv]=Bekräfta att en enhetsbegäran använder PIN-koder som stämmer -+Comment[tr]=Eşleştirme PIN'i kullanarak bir aygıt isteğini onaylayın - Comment[uk]=Підтвердження запиту пристрою відповідними PIN-кодами - Comment[x-test]=xxConfirm a device request using matching PINsxx - Comment[zh_CN]=确认设备请求使用了匹配的 PIN -+Comment[zh_TW]=利用比對 PIN 碼確認裝置的要求 - Action=Popup - - [Event/bluedevilRequestPin] - Name=Request PIN -+Name[bs]=Zahtijevaj PIN - Name[ca]=Sol·licita el PIN - Name[cs]=Vyžádat PIN - Name[de]=PIN anfordern -+Name[el]=Αίτηση PIN - Name[en_GB]=Request PIN - Name[es]=Solicitar PIN - Name[fi]=Pyydä PINiä -@@ -215,6 +272,7 @@ Name[fr]=Demande de code « PIN » +@@ -241,6 +241,7 @@ Name[fr]=Demande de code « PIN » Name[it]=Richiesta PIN Name[nb]=Be om PIN Name[nl]=Om PIN verzoeken @@ -508,60 +286,7 @@ index bda24b0..81433dd 100644 Name[pl]=Żąda numeru PIN Name[pt]=Pedir o PIN Name[pt_BR]=Solicitar o PIN -@@ -225,20 +283,31 @@ Name[sr@ijekavian]=Захтијевај ПИН - Name[sr@ijekavianlatin]=Zahtijevaj PIN - Name[sr@latin]=Zahtevaj PIN - Name[sv]=Begär PIN-kod -+Name[tr]=PIN iste - Name[uk]=Запит щодо PIN-коду - Name[x-test]=xxRequest PINxx - Name[zh_CN]=请求 PIN -+Name[zh_TW]=需要 PIN 碼 - Comment=A PIN is needed -+Comment[bs]=Potreban je PIN - Comment[ca]=Es necessita un PIN - Comment[cs]=Je potřeba PIN - Comment[de]=Eine PIN wird benötigt -+Comment[el]=Απαιτείται PIN - Comment[en_GB]=A PIN is needed - Comment[es]=Se necesita un PIN - Comment[fi]=PIN vaaditaan - Comment[fr]=Un code « PIN » est nécessaire - Comment[it]=Un PIN è richiesto -+Comment[ja]=PIN が必要です -+Comment[kk]=PIN -коды керек -+Comment[km]=ត្រូវការ PIN -+Comment[ko]=PIN이 필요함 -+Comment[lt]=Reikia PIN -+Comment[mr]=PIN ची गरज आहे - Comment[nb]=En PIN kreves - Comment[nl]=Er is een PIN nodig -+Comment[pa]=ਪਿਨ ਦੀ ਲੋੜ ਹੈ - Comment[pl]=Potrzebny jest numer PIN - Comment[pt]=É necessário um PIN - Comment[pt_BR]=É necessário um PIN -@@ -249,16 +318,20 @@ Comment[sr@ijekavian]=Потребан је ПИН - Comment[sr@ijekavianlatin]=Potreban je PIN - Comment[sr@latin]=Potreban je PIN - Comment[sv]=En PIN-kod behövs -+Comment[tr]=PIN gerekiyor - Comment[uk]=Потрібен PIN-код - Comment[x-test]=xxA PIN is neededxx - Comment[zh_CN]=需要 PIN -+Comment[zh_TW]=需要 PIN 碼 - Action=Popup - - [Event/bluedevilIncomingFile] - Name=Incoming File -+Name[bs]=Dolazeća datoteka - Name[ca]=Fitxer entrant - Name[cs]=Příchozí soubor - Name[de]=Eingehende Datei -+Name[el]=Εισερχόμενο αρχείο - Name[en_GB]=Incoming File - Name[es]=Archivo entrante - Name[fi]=Saapuva tiedosto -@@ -266,6 +339,7 @@ Name[fr]=Fichier entrant +@@ -299,6 +300,7 @@ Name[fr]=Fichier entrant Name[it]=File in arrivo Name[nb]=Innkommende fil Name[nl]=Bestand aangeboden @@ -569,45 +294,8 @@ index bda24b0..81433dd 100644 Name[pl]=Przychodzący plik Name[pt]=Ficheiro Recebido Name[pt_BR]=Arquivo recebido -@@ -276,20 +350,26 @@ Name[sr@ijekavian]=Долазни фајл - Name[sr@ijekavianlatin]=Dolazni fajl - Name[sr@latin]=Dolazni fajl - Name[sv]=Inkommande fil -+Name[tr]=Gelen Dosya - Name[uk]=Вхідний файл - Name[x-test]=xxIncoming Filexx - Name[zh_CN]=正在传入的文件 -+Name[zh_TW]=要傳進來的檔案 - Comment=Incoming file transfer -+Comment[bs]=Dolazni transfer datoteke - Comment[ca]=Transferència de fitxer entrant - Comment[cs]=Příchozí přenos souboru - Comment[de]=Eingehende Dateiübertragung -+Comment[el]=Μεταφορά εισερχόμενου αρχείου - Comment[en_GB]=Incoming file transfer - Comment[es]=Transferencia de archivo entrante -+Comment[et]=Sisenev failiedastus - Comment[fi]=Saapuva tiedostonsiirto - Comment[fr]=Transfert de fichier entrant - Comment[it]=Trasferimento di file in arrivo - Comment[nb]=Innkommende filoverføring - Comment[nl]=Inkomende bestandsoverdracht -+Comment[pa]=ਆ ਰਹੀ ਫਾਇਲ ਟਰਾਂਸਫਰ - Comment[pl]=Przychodzące przesyłanie pliku - Comment[pt]=Transferência de ficheiro recebida - Comment[pt_BR]=Transferência de arquivo recebida -@@ -300,7 +380,9 @@ Comment[sr@ijekavian]=Долазни пренос фајла - Comment[sr@ijekavianlatin]=Dolazni prenos fajla - Comment[sr@latin]=Dolazni prenos fajla - Comment[sv]=Inkommande filöverföring -+Comment[tr]=Gelen dosya aktarımı - Comment[uk]=Вхідне перенесення файла - Comment[x-test]=xxIncoming file transferxx - Comment[zh_CN]=收到文件传输 -+Comment[zh_TW]=進來的檔案傳輸 - Action=Popup diff --git a/src/daemon/helpers/authorize/authorize.cpp b/src/daemon/helpers/authorize/authorize.cpp -index c6f44da..6847ba9 100644 +index c6f44daf2e770ef7ea1c220dae259dbb1267a599..6847ba94dd9a784c06b80f2fbe9976dfcdafaca9 100644 --- a/src/daemon/helpers/authorize/authorize.cpp +++ b/src/daemon/helpers/authorize/authorize.cpp @@ -39,33 +39,33 @@ Authorize::Authorize() @@ -655,7 +343,7 @@ index c6f44da..6847ba9 100644 } diff --git a/src/daemon/helpers/authorize/authorize.h b/src/daemon/helpers/authorize/authorize.h -index d881baa..b3b4190 100644 +index d881baa0dd3d5f9d1244d70a28b7c4d6af03bdb3..b3b41902e56831091d6bb009254f8ee76e0e00ed 100644 --- a/src/daemon/helpers/authorize/authorize.h +++ b/src/daemon/helpers/authorize/authorize.h @@ -32,8 +32,7 @@ @@ -685,7 +373,7 @@ index d881baa..b3b4190 100644 + +#endif // AUTHORIZE_H diff --git a/src/daemon/helpers/authorize/main.cpp b/src/daemon/helpers/authorize/main.cpp -index 615245f..8106ff6 100644 +index 615245f4fcd38bb3d8a1e2ca65febbe4e123b647..8106ff697e861a18d468330c9d5c5050400bc4b1 100644 --- a/src/daemon/helpers/authorize/main.cpp +++ b/src/daemon/helpers/authorize/main.cpp @@ -18,15 +18,10 @@ @@ -705,7 +393,7 @@ index 615245f..8106ff6 100644 { QApplication app(argc, argv); diff --git a/src/daemon/helpers/confirmmodechange/confirmmodechange.cpp b/src/daemon/helpers/confirmmodechange/confirmmodechange.cpp -index 1328f74..62eccd3 100644 +index 1328f74cba667fddf14c8ce23a3e7e4b54e45fdf..62eccd32840e48cb8919ee538844381db57d48d7 100644 --- a/src/daemon/helpers/confirmmodechange/confirmmodechange.cpp +++ b/src/daemon/helpers/confirmmodechange/confirmmodechange.cpp @@ -37,7 +37,7 @@ ConfirmModeChange::ConfirmModeChange() @@ -744,7 +432,7 @@ index 1328f74..62eccd3 100644 } - diff --git a/src/daemon/helpers/confirmmodechange/confirmmodechange.h b/src/daemon/helpers/confirmmodechange/confirmmodechange.h -index 4d79b02..572fb57 100644 +index 4d79b02b16457e377dc364de32ab51d9ad41f156..572fb57e2a6544cce08a13fb48d13b17ad14e121 100644 --- a/src/daemon/helpers/confirmmodechange/confirmmodechange.h +++ b/src/daemon/helpers/confirmmodechange/confirmmodechange.h @@ -19,8 +19,8 @@ @@ -785,7 +473,7 @@ index 4d79b02..572fb57 100644 + +#endif // CONFIRM_MODE_CHANGE_H diff --git a/src/daemon/helpers/confirmmodechange/main.cpp b/src/daemon/helpers/confirmmodechange/main.cpp -index b4ed946..a2e05bb 100644 +index b4ed9463740c200643f468a44bebf5040ae30d70..a2e05bb510e3ea60032fe3c3760573c34595b3ed 100644 --- a/src/daemon/helpers/confirmmodechange/main.cpp +++ b/src/daemon/helpers/confirmmodechange/main.cpp @@ -18,15 +18,10 @@ @@ -805,7 +493,7 @@ index b4ed946..a2e05bb 100644 { QApplication app(argc,argv); diff --git a/src/daemon/helpers/requestconfirmation/main.cpp b/src/daemon/helpers/requestconfirmation/main.cpp -index e7ecde0..f324060 100644 +index e7ecde08ffc89456739563f54350c49067352520..f32406041b35212154d6ac7e854a6a908588e65b 100644 --- a/src/daemon/helpers/requestconfirmation/main.cpp +++ b/src/daemon/helpers/requestconfirmation/main.cpp @@ -22,10 +22,6 @@ @@ -820,7 +508,7 @@ index e7ecde0..f324060 100644 { QApplication app(argc, argv); diff --git a/src/daemon/helpers/requestconfirmation/requestconfirmation.cpp b/src/daemon/helpers/requestconfirmation/requestconfirmation.cpp -index ac24731..31b15c3 100644 +index ac24731af2f14c5978177cdd3f278c07323f78b3..31b15c361665763c0d2bb6fd5bd758d3adb899c9 100644 --- a/src/daemon/helpers/requestconfirmation/requestconfirmation.cpp +++ b/src/daemon/helpers/requestconfirmation/requestconfirmation.cpp @@ -35,7 +35,7 @@ RequestConfirmation::RequestConfirmation() : QObject() @@ -855,7 +543,7 @@ index ac24731..31b15c3 100644 } diff --git a/src/daemon/helpers/requestconfirmation/requestconfirmation.h b/src/daemon/helpers/requestconfirmation/requestconfirmation.h -index 60ebff8..59c6cfa 100644 +index 60ebff85b074371422f1518902a70964dd1c20a7..59c6cfa4847d3738924e53b9996b7328d0edb1e1 100644 --- a/src/daemon/helpers/requestconfirmation/requestconfirmation.h +++ b/src/daemon/helpers/requestconfirmation/requestconfirmation.h @@ -19,8 +19,8 @@ @@ -896,7 +584,7 @@ index 60ebff8..59c6cfa 100644 + +#endif // REQUEST_CONFIRMATION_H diff --git a/src/daemon/helpers/requestpin/dialogWidget.ui b/src/daemon/helpers/requestpin/dialogWidget.ui -index 478f1be..8e769a3 100644 +index 478f1be9610ce09342b748ddc36bc0b408b4a5de..8e769a374a0e14fc3914560342750ef9395f919e 100644 --- a/src/daemon/helpers/requestpin/dialogWidget.ui +++ b/src/daemon/helpers/requestpin/dialogWidget.ui @@ -7,7 +7,7 @@ @@ -922,7 +610,7 @@ index 478f1be..8e769a3 100644 1234 diff --git a/src/daemon/helpers/requestpin/main.cpp b/src/daemon/helpers/requestpin/main.cpp -index 8472108..e3cfb29 100644 +index 8472108a253c064b5b4030b2d2e55d8b2a04bf95..e3cfb29961d8485e036897ad0676fe07b6c658b0 100644 --- a/src/daemon/helpers/requestpin/main.cpp +++ b/src/daemon/helpers/requestpin/main.cpp @@ -22,10 +22,6 @@ @@ -937,7 +625,7 @@ index 8472108..e3cfb29 100644 { QApplication app(argc, argv); diff --git a/src/daemon/helpers/requestpin/requestpin.cpp b/src/daemon/helpers/requestpin/requestpin.cpp -index 7402b25..8b5f88c 100644 +index 7402b25dbd16a16ad3b7bd9e057162101c8d1744..8b5f88c904c2237bf95b340c9ef8f0dbbfaff04a 100644 --- a/src/daemon/helpers/requestpin/requestpin.cpp +++ b/src/daemon/helpers/requestpin/requestpin.cpp @@ -37,9 +37,7 @@ @@ -1032,7 +720,7 @@ index 7402b25..8b5f88c 100644 m_dialogWidget->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!pin.isEmpty()); } diff --git a/src/daemon/helpers/requestpin/requestpin.h b/src/daemon/helpers/requestpin/requestpin.h -index 3cc09e6..bfa96dc 100644 +index 3cc09e6de018d22b035e19b70499cb556951cc22..bfa96dc859f4587b2d94ee14aa10db19f73c6db4 100644 --- a/src/daemon/helpers/requestpin/requestpin.h +++ b/src/daemon/helpers/requestpin/requestpin.h @@ -19,14 +19,15 @@ @@ -1082,7 +770,7 @@ index 3cc09e6..bfa96dc 100644 + +#endif // REQUEST_PIN_H diff --git a/src/daemon/kded/BlueDevilDaemon.cpp b/src/daemon/kded/BlueDevilDaemon.cpp -index 1211103..0b59ce5 100644 +index 12111036565365212f9d7a520b881197652ee3e6..0b59ce5d45ef33630408a933a4f67bffb6f14597 100644 --- a/src/daemon/kded/BlueDevilDaemon.cpp +++ b/src/daemon/kded/BlueDevilDaemon.cpp @@ -38,6 +38,7 @@ @@ -1466,7 +1154,7 @@ index 1211103..0b59ce5 100644 return info; } diff --git a/src/daemon/kded/BlueDevilDaemon.h b/src/daemon/kded/BlueDevilDaemon.h -index a8688ae..a4a396b 100644 +index a8688ae18871454e34a586f76aa10693180f5cbe..a4a396b576294593d0cf886369a833d059d91ab3 100644 --- a/src/daemon/kded/BlueDevilDaemon.h +++ b/src/daemon/kded/BlueDevilDaemon.h @@ -22,43 +22,59 @@ @@ -1575,7 +1263,7 @@ index a8688ae..a4a396b 100644 private: struct Private; diff --git a/src/daemon/kded/CMakeLists.txt b/src/daemon/kded/CMakeLists.txt -index 3a8ddb7..651e68d 100644 +index 3a8ddb75db866034dcc2a0b80b93e460f164fba4..651e68dd47f4919061713d223c4395e2e8a0f231 100644 --- a/src/daemon/kded/CMakeLists.txt +++ b/src/daemon/kded/CMakeLists.txt @@ -26,7 +26,7 @@ kconfig_add_kcfg_files(kded_bluedevil_SRCS ../../settings/filereceiversettings.k @@ -1587,76 +1275,8 @@ index 3a8ddb7..651e68d 100644 target_link_libraries(kded_bluedevil Qt5::Gui -diff --git a/src/daemon/kded/bluedevil.desktop b/src/daemon/kded/bluedevil.desktop -index 6799d91..b65cc5a 100644 ---- a/src/daemon/kded/bluedevil.desktop -+++ b/src/daemon/kded/bluedevil.desktop -@@ -9,16 +9,25 @@ X-KDE-Kded-load-on-demand=false - X-KDE-Kded-phase=1 - - Name=Bluetooth -+Name[bs]=Blutut - Name[ca]=Bluetooth - Name[cs]=Bluetooth - Name[de]=Bluetooth -+Name[el]=Bluetooth - Name[en_GB]=Bluetooth - Name[es]=Bluetooth -+Name[et]=Bluetooth - Name[fi]=Bluetooth - Name[fr]=Bluetooth - Name[it]=Bluetooth -+Name[ja]=Bluetooth -+Name[kk]=Bluetooth -+Name[ko]=블루투스 -+Name[lt]=Bluetooth -+Name[mr]=ब्लूटूथ - Name[nb]=Blåtann - Name[nl]=Bluetooth -+Name[pa]=ਬਲਿਊਟੁੱਥ - Name[pl]=Bluetooth - Name[pt]=Bluetooth - Name[pt_BR]=Bluetooth -@@ -29,21 +38,27 @@ Name[sr@ijekavian]=Блутут - Name[sr@ijekavianlatin]=Bluetooth - Name[sr@latin]=Bluetooth - Name[sv]=Blåtand -+Name[tr]=Bluetooth - Name[uk]=Bluetooth - Name[x-test]=xxBluetoothxx - Name[zh_CN]=蓝牙 -+Name[zh_TW]=藍牙 - - Comment=Handles Bluetooth events -+Comment[bs]=Obrađuje Bluetooth događaje - Comment[ca]=Gestiona els esdeveniments del Bluetooth - Comment[cs]=Ovládá události Bluetooth - Comment[de]=Verarbeitung von Bluetooth-Ereignissen -+Comment[el]=Χειρίζεται γεγονότα Bluetooth - Comment[en_GB]=Handles Bluetooth events --Comment[es]=Gestiona los eventos de Bluetooth -+Comment[es]=Maneja eventos de Bluetooth -+Comment[et]=Bluetoothi sündmuste käitlemine - Comment[fi]=Käsittelee Bluetooth-tapahtumia - Comment[fr]=Gère les évènements Bluetooth - Comment[it]=Gestisce eventi Bluetooth - Comment[nb]=Håndterer Blåtann-hendelser - Comment[nl]=Behandelt bluetooth-gebeurtenissen -+Comment[pa]=ਬਲਿਊਟੁੱਥ ਘਟਨਾਵਾਂ ਕੰਟਰੋਲ ਕਰਨ ਲਈ - Comment[pl]=Obsługa zdarzeń Bluetooth - Comment[pt]=Lida com os eventos de Bluetooth - Comment[pt_BR]=Lida com os eventos de Bluetooth -@@ -54,6 +69,8 @@ Comment[sr@ijekavian]=Рукује блутут догађајима - Comment[sr@ijekavianlatin]=Rukuje bluetooth događajima - Comment[sr@latin]=Rukuje bluetooth događajima - Comment[sv]=Hanterar Blåtandhändelser -+Comment[tr]=Bluetooth olaylarını ele alır - Comment[uk]=Обробляє події Bluetooth - Comment[x-test]=xxHandles Bluetooth eventsxx - Comment[zh_CN]=处理蓝牙事件 -+Comment[zh_TW]=處理藍牙事件 diff --git a/src/daemon/kded/bluezagent.h b/src/daemon/kded/bluezagent.h -index aedfc90..d5f4db7 100644 +index aedfc90876e6bdee5d0335ad9b72c577d508f3cc..d5f4db7684fd032702a5268946c0840a395a2911 100644 --- a/src/daemon/kded/bluezagent.h +++ b/src/daemon/kded/bluezagent.h @@ -19,7 +19,6 @@ @@ -1744,7 +1364,7 @@ index aedfc90..d5f4db7 100644 + +#endif // BLUEZAGENT_H diff --git a/src/daemon/kded/filereceiver/filereceiver.cpp b/src/daemon/kded/filereceiver/filereceiver.cpp -index 00405b1..91d2005 100644 +index 00405b1f254cb60aaeb5b3b7ecf292a2ef7044c4..91d20051b2e3100a73261af0f70c9a3a75e0739e 100644 --- a/src/daemon/kded/filereceiver/filereceiver.cpp +++ b/src/daemon/kded/filereceiver/filereceiver.cpp @@ -19,40 +19,46 @@ @@ -1811,7 +1431,7 @@ index 00405b1..91d2005 100644 call->deleteLater(); diff --git a/src/daemon/kded/filereceiver/filereceiver.h b/src/daemon/kded/filereceiver/filereceiver.h -index e6dc6fb..7011f4a 100644 +index e6dc6fb075923a33a90b69773f5eeaf46d48ad64..7011f4a4d00e13ca44684498d9bf1539e1b133a0 100644 --- a/src/daemon/kded/filereceiver/filereceiver.h +++ b/src/daemon/kded/filereceiver/filereceiver.h @@ -21,16 +21,23 @@ @@ -1845,7 +1465,7 @@ index e6dc6fb..7011f4a 100644 -#endif //FILE_RECEIVER_H +#endif // FILE_RECEIVER_H diff --git a/src/daemon/kded/filereceiver/obexagent.cpp b/src/daemon/kded/filereceiver/obexagent.cpp -index 7fc7bca..5af1400 100644 +index 7fc7bca4c201905c3f2ba23b85085a6cc6984b86..5af1400671b5a9f0dd20ac44f3751ef7f5e80cc9 100644 --- a/src/daemon/kded/filereceiver/obexagent.cpp +++ b/src/daemon/kded/filereceiver/obexagent.cpp @@ -24,24 +24,17 @@ @@ -1891,7 +1511,7 @@ index 7fc7bca..5af1400 100644 + qCDebug(BLUEDAEMON) << "Release"; } diff --git a/src/daemon/kded/filereceiver/obexagent.h b/src/daemon/kded/filereceiver/obexagent.h -index 72c3220..2300fe3 100644 +index 72c322028886039580d11d90569b6bd9812f8646..2300fe3176fad594899be25eca5040d3f5b939d5 100644 --- a/src/daemon/kded/filereceiver/obexagent.h +++ b/src/daemon/kded/filereceiver/obexagent.h @@ -24,20 +24,19 @@ @@ -1924,7 +1544,7 @@ index 72c3220..2300fe3 100644 -#endif //OBEX_AGENT_H +#endif // OBEX_AGENT_H diff --git a/src/daemon/kded/filereceiver/receivefilejob.cpp b/src/daemon/kded/filereceiver/receivefilejob.cpp -index 5b9a8f4..f6342fd 100644 +index 5b9a8f4918ddea5e2be3c65d10195aaa04d301b5..f6342fd6bac721afd1b72df97fd085c1d5be7ff4 100644 --- a/src/daemon/kded/filereceiver/receivefilejob.cpp +++ b/src/daemon/kded/filereceiver/receivefilejob.cpp @@ -42,7 +42,7 @@ @@ -2101,7 +1721,7 @@ index 5b9a8f4..f6342fd 100644 path = xdgCacheHome + fileName + QString::number(i); i++; diff --git a/src/daemon/kded/filereceiver/receivefilejob.h b/src/daemon/kded/filereceiver/receivefilejob.h -index 13c6913..68a88fe 100644 +index 13c69134a569b4a62ae1f82da34b7f5dbd8307d6..68a88feab782bcb9d93c9deb01fa32af51e0b722 100644 --- a/src/daemon/kded/filereceiver/receivefilejob.h +++ b/src/daemon/kded/filereceiver/receivefilejob.h @@ -16,7 +16,6 @@ @@ -2187,7 +1807,7 @@ index 13c6913..68a88fe 100644 +#endif // RECEIVE_FILE_JOB_H diff --git a/src/fileitemactionplugin/CMakeLists.txt b/src/fileitemactionplugin/CMakeLists.txt -index 3737c68..39d6e33 100644 +index 3737c683922efc0d21222281a55e56bc9a70748f..39d6e33e58b8d7309a145a61fe2a3911d77433d3 100644 --- a/src/fileitemactionplugin/CMakeLists.txt +++ b/src/fileitemactionplugin/CMakeLists.txt @@ -1,9 +1,17 @@ @@ -2210,86 +1830,9 @@ index 3737c68..39d6e33 100644 + install(TARGETS bluetoothfileitemaction DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES bluedevilsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff --git a/src/fileitemactionplugin/bluedevilsendfile.desktop b/src/fileitemactionplugin/bluedevilsendfile.desktop -index 1896d55..4ce580d 100644 ---- a/src/fileitemactionplugin/bluedevilsendfile.desktop -+++ b/src/fileitemactionplugin/bluedevilsendfile.desktop -@@ -1,16 +1,26 @@ - [Desktop Entry] - Type=Service - Name=Send file via Bluetooth -+Name[bs]=Šalji datoteku preko Bluetoots - Name[ca]=Envia un fitxer per Bluetooth - Name[cs]=Poslat soubor přes Bluetooth - Name[de]=Datei über Bluetooth versenden -+Name[el]=Αποστολή αρχείου μέσω Bluetooth - Name[en_GB]=Send file via Bluetooth --Name[es]=Enviar archivo usando Bluetooth -+Name[es]=Enviar archivo por Bluetooth -+Name[et]=Faili saatmine Bluetoothi kaudu - Name[fi]=Lähetä tiedosto Bluetoothin kautta - Name[fr]=Envoi de fichiers via Bluetooth - Name[it]=Invia file via Bluetooth -+Name[ja]=Bluetooth を通してファイルを送信 -+Name[kk]=Bluetooth арқылы файлды жіберу -+Name[km]=ផ្ញើ​ឯកសារ​តាម​ប៊្លូធូស -+Name[ko]=블루투스로 파일 보내기 -+Name[lt]=Siųsti per Bluetooth -+Name[mr]=ब्लूटूथ द्वारे फाईल पाठवा - Name[nb]=Send fil over Blåtann - Name[nl]=Verzendt bestand over bluetooth -+Name[pa]=ਫਾਇਲ ਨੂੰ ਬਲਿਊਟੁੱਥ ਰਾਹੀਂ ਭੇਜੋ - Name[pl]=Wyślij plik przez Bluetooth - Name[pt]=Enviar o ficheiro por Bluetooth - Name[pt_BR]=Enviar arquivo por Bluetooth -@@ -21,21 +31,32 @@ Name[sr@ijekavian]=Слање фајлова преко блутута - Name[sr@ijekavianlatin]=Slanje fajlova preko Bluetootha - Name[sr@latin]=Slanje fajlova preko Bluetootha - Name[sv]=Skicka fil via Blåtand -+Name[tr]=Bluetooth üzerinden dosya gönder - Name[uk]=Надіслати файл за допомогою Bluetooth - Name[x-test]=xxSend file via Bluetoothxx - Name[zh_CN]=通过蓝牙发送文件 -+Name[zh_TW]=透過藍牙傳送檔案 - X-KDE-Library=bluetoothfileitemaction - X-KDE-Submenu=Bluetooth -+X-KDE-Submenu[bs]=Blutut - X-KDE-Submenu[ca]=Bluetooth - X-KDE-Submenu[cs]=Bluetooth - X-KDE-Submenu[de]=Bluetooth -+X-KDE-Submenu[el]=Bluetooth - X-KDE-Submenu[en_GB]=Bluetooth - X-KDE-Submenu[es]=Bluetooth - X-KDE-Submenu[fi]=Bluetooth - X-KDE-Submenu[fr]=Bluetooth - X-KDE-Submenu[it]=Bluetooth -+X-KDE-Submenu[ja]=Bluetooth -+X-KDE-Submenu[kk]=Bluetooth -+X-KDE-Submenu[km]=ប៊្លូធូស -+X-KDE-Submenu[ko]=블루투스 -+X-KDE-Submenu[lt]=Bluetooth -+X-KDE-Submenu[mr]=ब्लूटूथ - X-KDE-Submenu[nb]=Blåtann - X-KDE-Submenu[nl]=Bluetooth -+X-KDE-Submenu[pa]=ਬਲਿਊਟੁੱਥ - X-KDE-Submenu[pl]=Bluetooth - X-KDE-Submenu[pt]=Bluetooth - X-KDE-Submenu[pt_BR]=Bluetooth -@@ -46,9 +67,11 @@ X-KDE-Submenu[sr@ijekavian]=Блутут - X-KDE-Submenu[sr@ijekavianlatin]=Bluetooth - X-KDE-Submenu[sr@latin]=Bluetooth - X-KDE-Submenu[sv]=Blåtand -+X-KDE-Submenu[tr]=Bluetooth - X-KDE-Submenu[uk]=Bluetooth - X-KDE-Submenu[x-test]=xxBluetoothxx - X-KDE-Submenu[zh_CN]=蓝牙 -+X-KDE-Submenu[zh_TW]=藍牙 - Icon=preferences-system-bluetooth - ServiceTypes=KFileItemAction/Plugin - MimeType=application/octet-stream; diff --git a/src/fileitemactionplugin/kded_bluedevil.xml b/src/fileitemactionplugin/kded_bluedevil.xml new file mode 100644 -index 0000000..e447897 +index 0000000000000000000000000000000000000000..e4478975fd84d080888138513dd73c985117a894 --- /dev/null +++ b/src/fileitemactionplugin/kded_bluedevil.xml @@ -0,0 +1,23 @@ @@ -2317,7 +1860,7 @@ index 0000000..e447897 + + diff --git a/src/fileitemactionplugin/sendfileitemaction.cpp b/src/fileitemactionplugin/sendfileitemaction.cpp -index c750bc4..ba9d1fd 100644 +index c750bc4f3319ee93151b3c9b88b040993330285e..ba9d1fde43ed7c1fce90f9a30d377b968fffadef 100644 --- a/src/fileitemactionplugin/sendfileitemaction.cpp +++ b/src/fileitemactionplugin/sendfileitemaction.cpp @@ -33,57 +33,56 @@ @@ -2436,7 +1979,7 @@ index c750bc4..ba9d1fd 100644 KProcess process; diff --git a/src/fileitemactionplugin/sendfileitemaction.h b/src/fileitemactionplugin/sendfileitemaction.h -index f9eecc3..a194831 100644 +index f9eecc3a524c418330b706b666324eb76b731b6b..a1948319f4501710a6cbd1eb57b1202da726ac88 100644 --- a/src/fileitemactionplugin/sendfileitemaction.h +++ b/src/fileitemactionplugin/sendfileitemaction.h @@ -24,22 +24,26 @@ @@ -2472,7 +2015,7 @@ index f9eecc3..a194831 100644 #endif // SENDFILEITEMACTION_H diff --git a/src/fileitemactionplugin/types.h b/src/fileitemactionplugin/types.h new file mode 100644 -index 0000000..53f2e4a +index 0000000000000000000000000000000000000000..53f2e4a9db60946e70ca50b630f77fa90942ffec --- /dev/null +++ b/src/fileitemactionplugin/types.h @@ -0,0 +1,11 @@ @@ -2488,7 +2031,7 @@ index 0000000..53f2e4a + +#endif diff --git a/src/kcmodule/CMakeLists.txt b/src/kcmodule/CMakeLists.txt -index 64e6050..4145c1b 100644 +index 64e6050abd87c098659c13cf25d12933ed111616..4145c1bc814c84e4a84220d7b2da7243491d16ac 100644 --- a/src/kcmodule/CMakeLists.txt +++ b/src/kcmodule/CMakeLists.txt @@ -24,9 +24,9 @@ add_library(kcm_bluedevildevices MODULE ${kcm_bluedevildevices_PART_SRCS}) @@ -2505,7 +2048,7 @@ index 64e6050..4145c1b 100644 target_link_libraries(kcm_bluedevildevices Qt5::Widgets diff --git a/src/kcmodule/bluedeviladapters.cpp b/src/kcmodule/bluedeviladapters.cpp -index 9185552..13504c9 100644 +index 9185552f02bb3406b8448cd0e64eb818a6fbe117..13504c9a12a33c6deefd9f51ce6f54d9cb90c02a 100644 --- a/src/kcmodule/bluedeviladapters.cpp +++ b/src/kcmodule/bluedeviladapters.cpp @@ -62,8 +62,8 @@ AdapterSettings::AdapterSettings(Adapter *adapter, KCModule *parent) @@ -2562,83 +2105,10 @@ index 9185552..13504c9 100644 layout->addWidget(new QLabel(i18n("No adapters found. Please connect one."), m_noAdaptersMessage), 1, 1, Qt::AlignHCenter); diff --git a/src/kcmodule/bluedeviladapters.desktop b/src/kcmodule/bluedeviladapters.desktop -index f1f5e50..7a32916 100644 +index 1c08977f52ffaeb5349e13c85d01d9221d67d95f..b4befcc61e2379a392701cccb822c5c874c8228e 100644 --- a/src/kcmodule/bluedeviladapters.desktop +++ b/src/kcmodule/bluedeviladapters.desktop -@@ -12,16 +12,25 @@ X-KDE-System-Settings-Parent-Category=bluetooth - X-KDE-Weight=100 - - Name=Adapters -+Name[bs]=Adapteri - Name[ca]=Adaptadors - Name[cs]=Adaptéry - Name[de]=Adapter -+Name[el]=Προσαρμογείς - Name[en_GB]=Adapters - Name[es]=Adaptadores - Name[fi]=Sovittimet - Name[fr]=Adaptateurs - Name[it]=Adattatori -+Name[ja]=アダプタ -+Name[kk]=Адаптерлері -+Name[km]=អាដាប់ទ័រ -+Name[ko]=어댑터 -+Name[lt]=Adapteriai -+Name[mr]=एडाप्टर्स - Name[nb]=Adaptere - Name[nl]=Adapters -+Name[pa]=ਅਡੈਪਟਰ - Name[pl]=Adaptery - Name[pt]=Adaptadores - Name[pt_BR]=Adaptadores -@@ -32,21 +41,27 @@ Name[sr@ijekavian]=Адаптери - Name[sr@ijekavianlatin]=Adapteri - Name[sr@latin]=Adapteri - Name[sv]=Anslutningar -+Name[tr]=Bağdaştırıcılar - Name[uk]=Адаптери - Name[x-test]=xxAdaptersxx - Name[zh_CN]=适配器 -+Name[zh_TW]=轉接器 - - Comment=Configure Bluetooth adapters -+Comment[bs]=Konfigurisanje Blutut adaptera - Comment[ca]=Configura els adaptadors Bluetooth - Comment[cs]=Nastavte adaptéry Bluetooth - Comment[de]=Bluetooth-Adapter einrichten -+Comment[el]=Διαμόρφωση προσαρμογέων Bluetooth - Comment[en_GB]=Configure Bluetooth adapters - Comment[es]=Configurar adaptadores Bluetooth -+Comment[et]=Bluetoothi adapterite seadistamine - Comment[fi]=Bluetooth-sovittimien asetukset - Comment[fr]=Configure les adaptateurs Bluetooth - Comment[it]=Configura gli adattatori Bluetooth - Comment[nb]=Sett opp Blåtann-adaptere - Comment[nl]=Bluetooth-adapters instellen -+Comment[pa]=ਬਲਿਊਟੁੱਥ ਐਡਪਟਰ ਸੰਰਚਨਾ - Comment[pl]=Ustawienia adapterów Bluetooth - Comment[pt]=Configurar os adaptadores de Bluetooth - Comment[pt_BR]=Configura os adaptadores Bluetooth -@@ -57,14 +72,18 @@ Comment[sr@ijekavian]=Подесите блутут адаптере - Comment[sr@ijekavianlatin]=Podesite bluetooth adaptere - Comment[sr@latin]=Podesite bluetooth adaptere - Comment[sv]=Anpassa Blåtandanslutningar -+Comment[tr]=Bluetooth bağdaştırıcılarını yapılandır - Comment[uk]=Налаштування адаптерів Bluetooth - Comment[x-test]=xxConfigure Bluetooth adaptersxx - Comment[zh_CN]=配置蓝牙适配器 -+Comment[zh_TW]=設定藍牙轉接器 - - X-KDE-Keywords=Network,Connectivity,Bluetooth -+X-KDE-Keywords[bs]=Network,Connectivity,Bluetooth - X-KDE-Keywords[ca]=Xarxa,Connectivitat,Bluetooth - X-KDE-Keywords[cs]=Síť,Konektivita,Bluetooth - X-KDE-Keywords[de]=Netzwerk,Verbindungen,Bluetooth -+X-KDE-Keywords[el]=Δίκτυο,Συνδεσιμότητα,Bluetooth - X-KDE-Keywords[en_GB]=Network,Connectivity,Bluetooth - X-KDE-Keywords[es]=Red,Conectividad,Bluetooth - X-KDE-Keywords[fi]=Verkko,Yhteydet,Bluetooth -@@ -72,6 +91,7 @@ X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth +@@ -80,6 +80,7 @@ X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth X-KDE-Keywords[it]=Rete,Connettività,Bluetooth X-KDE-Keywords[nb]=Nettverk,sammenkobling,blåtann X-KDE-Keywords[nl]=Netwerkverbinding,connectiviteit,bluetooth @@ -2646,19 +2116,8 @@ index f1f5e50..7a32916 100644 X-KDE-Keywords[pl]=Sieć,Łączność,Bluetooth X-KDE-Keywords[pt]=Rede,Conectividade,Bluetooth X-KDE-Keywords[pt_BR]=Rede,Conectividade,Bluetooth -@@ -82,8 +102,10 @@ X-KDE-Keywords[sr@ijekavian]=Network,Connectivity,Bluetooth,мрежа,пове - X-KDE-Keywords[sr@ijekavianlatin]=Network,Connectivity,Bluetooth,mreža,povezivanje,Bluetooth - X-KDE-Keywords[sr@latin]=Network,Connectivity,Bluetooth,mreža,povezivanje,Bluetooth - X-KDE-Keywords[sv]=Nätverk,Anslutningar,Blåtand -+X-KDE-Keywords[tr]=Ağ, Bağlanılabilirlik, Bluetooth - X-KDE-Keywords[uk]=Network,Connectivity,Bluetooth,мережа,з’єднання,з'єднання - X-KDE-Keywords[x-test]=xxNetworkxx,xxConnectivityxx,xxBluetoothxx - X-KDE-Keywords[zh_CN]=Network,Connectivity,Bluetooth,网络,连接,蓝牙 -+X-KDE-Keywords[zh_TW]=Network,Connectivity,Bluetooth - - Categories=Qt;KDE;X-KDE-settings-bluetooth; diff --git a/src/kcmodule/bluedeviladapters.h b/src/kcmodule/bluedeviladapters.h -index 5a775bd..7ecbeb8 100644 +index 5a775bd2667ee2d2f97bb15d47953884ff57fa3f..7ecbeb84c5188f4321d4105a3568e7e7f36711de 100644 --- a/src/kcmodule/bluedeviladapters.h +++ b/src/kcmodule/bluedeviladapters.h @@ -36,7 +36,8 @@ class QLineEdit; @@ -2672,7 +2131,7 @@ index 5a775bd..7ecbeb8 100644 } diff --git a/src/kcmodule/bluedevildevices.cpp b/src/kcmodule/bluedevildevices.cpp -index 1135d6f..9474e93 100644 +index 1135d6f35e36165743428331ef5af9003bcbd78a..9474e93f096a9a5d55071262e2d06ecd9565f5f9 100644 --- a/src/kcmodule/bluedevildevices.cpp +++ b/src/kcmodule/bluedevildevices.cpp @@ -226,11 +226,11 @@ BluetoothDevicesDelegate::BluetoothDevicesDelegate(QObject *parent) @@ -2715,88 +2174,10 @@ index 1135d6f..9474e93 100644 layout->addWidget(new QLabel(i18n("No remote devices have been added"), m_noDevicesMessage), 1, 1, Qt::AlignHCenter); diff --git a/src/kcmodule/bluedevildevices.desktop b/src/kcmodule/bluedevildevices.desktop -index ecf6b45..38b83f9 100644 +index ba05bfc4789feb36ca9dd2ef0de7376ec2495e30..7e7235a4e1645673425b6c17030310d87a4471f2 100644 --- a/src/kcmodule/bluedevildevices.desktop +++ b/src/kcmodule/bluedevildevices.desktop -@@ -12,16 +12,27 @@ X-KDE-System-Settings-Parent-Category=bluetooth - X-KDE-Weight=50 - - Name=Devices -+Name[bs]=uređaji - Name[ca]=Dispositius - Name[cs]=Zařízení - Name[de]=Geräte -+Name[el]=Συσκευές - Name[en_GB]=Devices - Name[es]=Dispositivos - Name[fi]=Laitteet - Name[fr]=Périphériques - Name[it]=Dispositivi -+Name[ja]=デバイス -+Name[kk]=Құрылғылар -+Name[km]=ឧបករណ៍​ -+Name[ko]=장치 -+Name[lt]=Įrenginiai -+Name[mai]=डिवाइस -+Name[mr]=साधने -+Name[ms]=Peranti - Name[nb]=Enheter - Name[nl]=Apparaten -+Name[pa]=ਯੰਤਰ - Name[pl]=Urządzenia - Name[pt]=Dispositivos - Name[pt_BR]=Dispositivos -@@ -32,19 +43,29 @@ Name[sr@ijekavian]=Уређаји - Name[sr@ijekavianlatin]=Uređaji - Name[sr@latin]=Uređaji - Name[sv]=Enheter -+Name[tr]=Aygıtlar - Name[uk]=Пристрої - Name[x-test]=xxDevicesxx - Name[zh_CN]=设备 -+Name[zh_TW]=裝置 - - Comment=Manage Bluetooth devices -+Comment[bs]=Upravljanje Blutut uređaje - Comment[ca]=Gestiona els dispositius Bluetooth - Comment[cs]=Spravovat zařízení Bluetooth - Comment[de]=Bluetooth-Geräte verwalten -+Comment[el]=Διαχείριση συσκευών Bluetooth - Comment[en_GB]=Manage Bluetooth devices --Comment[es]=Gestionar los dispositivos Bluetooth -+Comment[es]=Gestión de dispositivos Bluetooth -+Comment[et]=Bluetoothi seadmete haldamine - Comment[fi]=Bluetooth-laitteiden asetukset - Comment[fr]=Gère les périphériques Bluetooth - Comment[it]=Gestisci i dispositivi Bluetooth -+Comment[ja]=Bluetooth デバイスを管理 -+Comment[kk]=Bluetooth құрылығыларын басқару -+Comment[ko]=블루투스 장치 관리 -+Comment[lt]=Konfigūruoti Bluetooth failų gavimą -+Comment[mr]=ब्लूटूथ साधने व्यवस्थापीत करा - Comment[nb]=Håndter Blåtann-enheter - Comment[nl]=Bluetooth-apparaten beheren - Comment[pl]=Zarządzaj urządzeniami Bluetooth -@@ -57,14 +78,18 @@ Comment[sr@ijekavian]=Управљајте блутут уређајима - Comment[sr@ijekavianlatin]=Upravljajte bluetooth uređajima - Comment[sr@latin]=Upravljajte bluetooth uređajima - Comment[sv]=Hantera Blåtandenheter -+Comment[tr]=Bluetooth aygıtlarını yönet - Comment[uk]=Керування пристроями Bluetooth - Comment[x-test]=xxManage Bluetooth devicesxx - Comment[zh_CN]=管理蓝牙设备 -+Comment[zh_TW]=管理藍牙裝置 - - X-KDE-Keywords=Network,Connectivity,Bluetooth -+X-KDE-Keywords[bs]=Network,Connectivity,Bluetooth - X-KDE-Keywords[ca]=Xarxa,Connectivitat,Bluetooth - X-KDE-Keywords[cs]=Síť,Konektivita,Bluetooth - X-KDE-Keywords[de]=Netzwerk,Verbindungen,Bluetooth -+X-KDE-Keywords[el]=Δίκτυο,Συνδεσιμότητα,Bluetooth - X-KDE-Keywords[en_GB]=Network,Connectivity,Bluetooth - X-KDE-Keywords[es]=Red,Conectividad,Bluetooth - X-KDE-Keywords[fi]=Verkko,Yhteydet,Bluetooth -@@ -72,6 +97,7 @@ X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth +@@ -81,6 +81,7 @@ X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth X-KDE-Keywords[it]=Rete,Connettività,Bluetooth X-KDE-Keywords[nb]=Nettverk,sammenkobling,blåtann X-KDE-Keywords[nl]=Netwerkverbinding,connectiviteit,bluetooth @@ -2804,19 +2185,8 @@ index ecf6b45..38b83f9 100644 X-KDE-Keywords[pl]=Sieć,Łączność,Bluetooth X-KDE-Keywords[pt]=Rede,Conectividade,Bluetooth X-KDE-Keywords[pt_BR]=Rede,Conectividade,Bluetooth -@@ -82,8 +108,10 @@ X-KDE-Keywords[sr@ijekavian]=Network,Connectivity,Bluetooth,мрежа,пове - X-KDE-Keywords[sr@ijekavianlatin]=Network,Connectivity,Bluetooth,mreža,povezivanje,Bluetooth - X-KDE-Keywords[sr@latin]=Network,Connectivity,Bluetooth,mreža,povezivanje,Bluetooth - X-KDE-Keywords[sv]=Nätverk,Anslutningar,Blåtand -+X-KDE-Keywords[tr]=Ağ, Bağlanılabilirlik, Bluetooth - X-KDE-Keywords[uk]=Network,Connectivity,Bluetooth,мережа,з’єднання,з'єднання - X-KDE-Keywords[x-test]=xxNetworkxx,xxConnectivityxx,xxBluetoothxx - X-KDE-Keywords[zh_CN]=Network,Connectivity,Bluetooth,网络,连接,蓝牙 -+X-KDE-Keywords[zh_TW]=Network,Connectivity,Bluetooth - - Categories=Qt;KDE;X-KDE-settings-bluetooth; diff --git a/src/kcmodule/bluedevildevices.h b/src/kcmodule/bluedevildevices.h -index e47b43e..db28629 100644 +index e47b43e91f6f89a449e806daeec531a3fe32be72..db28629dee426f89bb3ed7cb6b250d0615fa2c55 100644 --- a/src/kcmodule/bluedevildevices.h +++ b/src/kcmodule/bluedevildevices.h @@ -32,7 +32,8 @@ class QCheckBox; @@ -2830,7 +2200,7 @@ index e47b43e..db28629 100644 class Device; } diff --git a/src/kcmodule/bluedeviltransfer.cpp b/src/kcmodule/bluedeviltransfer.cpp -index fd1b120..fa0d55f 100644 +index fd1b1200bf036dc5300c9a2acd8080f737e14faf..fa0d55f929bb0ff203a113745a929ec8d58d7b98 100644 --- a/src/kcmodule/bluedeviltransfer.cpp +++ b/src/kcmodule/bluedeviltransfer.cpp @@ -40,6 +40,8 @@ K_PLUGIN_FACTORY_WITH_JSON(BlueDevilFactory, @@ -2864,80 +2234,10 @@ index fd1b120..fa0d55f 100644 { if (!m_restartNeeded) { diff --git a/src/kcmodule/bluedeviltransfer.desktop b/src/kcmodule/bluedeviltransfer.desktop -index 804b118..5bea142 100644 +index 526e04799a5ec442c1902e54cc087802855807c5..6dc96e7744fb55d3b5b536cdd9e6d7ec22c02dad 100644 --- a/src/kcmodule/bluedeviltransfer.desktop +++ b/src/kcmodule/bluedeviltransfer.desktop -@@ -12,16 +12,20 @@ X-KDE-System-Settings-Parent-Category=bluetooth - X-KDE-Weight=60 - - Name=File Transfers -+Name[bs]=Transfer datoteke - Name[ca]=Transferències de fitxers - Name[cs]=Přenosy souborů - Name[de]=Dateiübertragungen -+Name[el]=Μεταφορές αρχείων - Name[en_GB]=File Transfers --Name[es]=Transferencias de archivos -+Name[es]=Transferencias de archivo -+Name[et]=Failiedastused - Name[fi]=Tiedostonsiirto - Name[fr]=Transferts de fichiers - Name[it]=Trasferimenti di file - Name[nb]=Filoverføringer - Name[nl]=Bestandsoverdrachten -+Name[pa]=ਫਾਇਲ ਟਰਾਂਸਫਰ - Name[pl]=Przesyłanie plików - Name[pt]=Transferência de Ficheiros - Name[pt_BR]=Transferência de arquivos -@@ -32,21 +36,27 @@ Name[sr@ijekavian]=Преноси фајлова - Name[sr@ijekavianlatin]=Prenosi fajlova - Name[sr@latin]=Prenosi fajlova - Name[sv]=Filöverföringar -+Name[tr]=Dosya Aktarımı - Name[uk]=Перенесення файла - Name[x-test]=xxFile Transfersxx - Name[zh_CN]=文件传送 -+Name[zh_TW]=檔案傳輸 - - Comment=Configure Bluetooth file sharing and transfers -+Comment[bs]=Konfiguriranje Blutut dijeljenje datoteka i prijenos - Comment[ca]=Configura la compartició i transferència de fitxers per Bluetooth - Comment[cs]=Nastavte sdílení souborů přes Bluetooth - Comment[de]=Dateifreigaben und Dateiübertragung für Bluetooth einrichten -+Comment[el]=Διαμόρφωση διαμοιρασμού και μεταφοράς αρχείων με Bluetooth - Comment[en_GB]=Configure Bluetooth file sharing and transfers --Comment[es]=Configurar la función de compartir archivos y las transferencias por Bluetooth -+Comment[es]=Configurar compartición y transferencias de archivos por Bluetooth -+Comment[et]=Bluetoothi failide jagamise ja edastamine seadistamine - Comment[fi]=Bluetooth-tiedostonjaon ja -siirron asetukset - Comment[fr]=Configure le partage et les transferts de fichiers par Bluetooth - Comment[it]=Configura la condivisione e il trasferimento di file via Bluetooth - Comment[nb]=Sett opp deling og overføring av filer over Blåtann - Comment[nl]=Bestandsdeling en -overdracht via bluetooth instellen -+Comment[pa]=ਬਲਿਊਟੁੱਥ ਫਾਇਲ ਸਾਂਝ ਤੇ ਟਰਾਂਸਫਰ ਸੰਰਚਨਾ - Comment[pl]=Ustawienia udostępniania i przesyłanie plików przez Bluetooth - Comment[pt]=Configura a partilha e as transferências de ficheiros por Bluetooth - Comment[pt_BR]=Configura o compartilhamento e a transferência de arquivos por Bluetooth -@@ -57,14 +67,18 @@ Comment[sr@ijekavian]=Подесите преносе и дељење фајло - Comment[sr@ijekavianlatin]=Podesite prenose i deljenje fajlova preko Bluetoothom - Comment[sr@latin]=Podesite prenose i deljenje fajlova preko Bluetoothom - Comment[sv]=Anpassa fildelning och överföringar med Blåtand -+Comment[tr]=Bluetooth dosya paylaşımı ve transferlerini yapılandır - Comment[uk]=Налаштування надсилання та отримання файлів Bluetooth - Comment[x-test]=xxConfigure Bluetooth file sharing and transfersxx - Comment[zh_CN]=配置蓝牙文件共享和传输 -+Comment[zh_TW]=設定藍牙檔案共用與傳輸 - - X-KDE-Keywords=Network,Connectivity,Bluetooth -+X-KDE-Keywords[bs]=Network,Connectivity,Bluetooth - X-KDE-Keywords[ca]=Xarxa,Connectivitat,Bluetooth - X-KDE-Keywords[cs]=Síť,Konektivita,Bluetooth - X-KDE-Keywords[de]=Netzwerk,Verbindungen,Bluetooth -+X-KDE-Keywords[el]=Δίκτυο,Συνδεσιμότητα,Bluetooth - X-KDE-Keywords[en_GB]=Network,Connectivity,Bluetooth - X-KDE-Keywords[es]=Red,Conectividad,Bluetooth - X-KDE-Keywords[fi]=Verkko,Yhteydet,Bluetooth -@@ -72,6 +86,7 @@ X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth +@@ -79,6 +79,7 @@ X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth X-KDE-Keywords[it]=Rete,Connettività,Bluetooth X-KDE-Keywords[nb]=Nettverk,sammenkobling,blåtann X-KDE-Keywords[nl]=Netwerkverbinding,connectiviteit,bluetooth @@ -2945,19 +2245,8 @@ index 804b118..5bea142 100644 X-KDE-Keywords[pl]=Sieć,Łączność,Bluetooth X-KDE-Keywords[pt]=Rede,Conectividade,Bluetooth X-KDE-Keywords[pt_BR]=Rede,Conectividade,Bluetooth -@@ -82,8 +97,10 @@ X-KDE-Keywords[sr@ijekavian]=Network,Connectivity,Bluetooth,мрежа,пове - X-KDE-Keywords[sr@ijekavianlatin]=Network,Connectivity,Bluetooth,mreža,povezivanje,Bluetooth - X-KDE-Keywords[sr@latin]=Network,Connectivity,Bluetooth,mreža,povezivanje,Bluetooth - X-KDE-Keywords[sv]=Nätverk,Anslutningar,Blåtand -+X-KDE-Keywords[tr]=Ağ, Bağlanılabilirlik, Bluetooth - X-KDE-Keywords[uk]=Network,Connectivity,Bluetooth,мережа,з’єднання,з'єднання - X-KDE-Keywords[x-test]=xxNetworkxx,xxConnectivityxx,xxBluetoothxx - X-KDE-Keywords[zh_CN]=Network,Connectivity,Bluetooth,网络,连接,蓝牙 -+X-KDE-Keywords[zh_TW]=Network,Connectivity,Bluetooth - - Categories=Qt;KDE;X-KDE-settings-bluetooth; diff --git a/src/kcmodule/bluedeviltransfer.h b/src/kcmodule/bluedeviltransfer.h -index 5be3ae3..ace8542 100644 +index 5be3ae345beca5aa192a39118718ff427bc17393..ace854222bb036b2533aec23ef5dada4beeff923 100644 --- a/src/kcmodule/bluedeviltransfer.h +++ b/src/kcmodule/bluedeviltransfer.h @@ -24,26 +24,28 @@ @@ -3003,7 +2292,7 @@ index 5be3ae3..ace8542 100644 -#endif +#endif // _BLUEDEVILTRANSFER_H diff --git a/src/kcmodule/devicedetails.h b/src/kcmodule/devicedetails.h -index b612587..37326da 100644 +index b612587b996e0ef24077d7e0f146d9d71730a972..37326da8c0fb398d0a97fc36b87968fbb4b3ec8c 100644 --- a/src/kcmodule/devicedetails.h +++ b/src/kcmodule/devicedetails.h @@ -28,7 +28,8 @@ class QLineEdit; @@ -3017,7 +2306,7 @@ index b612587..37326da 100644 } diff --git a/src/kcmodule/systemcheck.cpp b/src/kcmodule/systemcheck.cpp -index 122021b..43cd864 100644 +index 122021b98adc57c1b979a757005709ec76e404b7..43cd86450e3453bd7acf27aebc938d8381160d19 100644 --- a/src/kcmodule/systemcheck.cpp +++ b/src/kcmodule/systemcheck.cpp @@ -41,6 +41,7 @@ SystemCheck::SystemCheck(QWidget *parent) @@ -3093,7 +2382,7 @@ index 122021b..43cd864 100644 { m_notDiscoverableAdapterError->setVisible(false); diff --git a/src/kcmodule/systemcheck.h b/src/kcmodule/systemcheck.h -index 74f9128..cccf899 100644 +index 74f9128b08eecbcb7770ab3c5b3f5b1ebd9b10be..cccf899a7bebd164086c23a6174bff56a35a3231 100644 --- a/src/kcmodule/systemcheck.h +++ b/src/kcmodule/systemcheck.h @@ -36,17 +36,6 @@ public: @@ -3131,7 +2420,7 @@ index 74f9128..cccf899 100644 KMessageWidget *m_notDiscoverableAdapterError; KMessageWidget *m_disabledNotificationsError; diff --git a/src/kio/bluetooth/kded_bluedevil.xml b/src/kio/bluetooth/kded_bluedevil.xml -index cb4d6fd..e447897 100644 +index cb4d6fdd3aeb8d5546833a8ee5de796c5e007537..e4478975fd84d080888138513dd73c985117a894 100644 --- a/src/kio/bluetooth/kded_bluedevil.xml +++ b/src/kio/bluetooth/kded_bluedevil.xml @@ -5,11 +5,19 @@ @@ -3158,7 +2447,7 @@ index cb4d6fd..e447897 100644 \ No newline at end of file + diff --git a/src/kio/bluetooth/kiobluetooth.cpp b/src/kio/bluetooth/kiobluetooth.cpp -index e7b1289..7d529e6 100644 +index e7b128983e77e865c11d095b5222caff7e8a3f33..7d529e6093097f32fb6fe86a3fe7037b3b21f553 100644 --- a/src/kio/bluetooth/kiobluetooth.cpp +++ b/src/kio/bluetooth/kiobluetooth.cpp @@ -30,10 +30,6 @@ @@ -3306,7 +2595,7 @@ index e7b1289..7d529e6 100644 } diff --git a/src/kio/bluetooth/kiobluetooth.h b/src/kio/bluetooth/kiobluetooth.h -index a353ca9..756bf92 100644 +index a353ca9473c70d77baf596f112b8894844e66fe5..756bf9246a6a69da90bd7633162e92f092c34cf8 100644 --- a/src/kio/bluetooth/kiobluetooth.h +++ b/src/kio/bluetooth/kiobluetooth.h @@ -36,13 +36,6 @@ @@ -3387,7 +2676,7 @@ index a353ca9..756bf92 100644 */ QMap m_supportedServices; diff --git a/src/kio/obexftp/CMakeLists.txt b/src/kio/obexftp/CMakeLists.txt -index d50825b..a770238 100644 +index d50825bd2b5c0e299e34a7bd5029f409c92bc2ed..a7702382f2b4837a4dd3c87b84eb9e0bdd57640a 100644 --- a/src/kio/obexftp/CMakeLists.txt +++ b/src/kio/obexftp/CMakeLists.txt @@ -1,5 +1,3 @@ @@ -3397,7 +2686,7 @@ index d50825b..a770238 100644 set(kio_obexftp_SRCS diff --git a/src/kio/obexftp/daemon/CMakeLists.txt b/src/kio/obexftp/daemon/CMakeLists.txt -index b7ad5d2..8a4ff87 100644 +index b7ad5d215523faaed7393f8d1edb537ccb609b63..8a4ff87f3a04af3c504fba740d6e87231b5f8d3b 100644 --- a/src/kio/obexftp/daemon/CMakeLists.txt +++ b/src/kio/obexftp/daemon/CMakeLists.txt @@ -12,7 +12,7 @@ qt5_add_dbus_interface(kded_obexftp_SRCS org.freedesktop.DBus.ObjectManager.xml @@ -3410,7 +2699,7 @@ index b7ad5d2..8a4ff87 100644 target_link_libraries(kded_obexftpdaemon Qt5::Core diff --git a/src/kio/obexftp/daemon/ObexFtpDaemon.cpp b/src/kio/obexftp/daemon/ObexFtpDaemon.cpp -index af66c7c..4170193 100644 +index af66c7ce4f47ddbb8581e39a89f0ef50ef5a4078..4170193ea42ab01fae7151ae6952acdec9a292f3 100644 --- a/src/kio/obexftp/daemon/ObexFtpDaemon.cpp +++ b/src/kio/obexftp/daemon/ObexFtpDaemon.cpp @@ -29,10 +29,6 @@ @@ -3574,7 +2863,7 @@ index af66c7c..4170193 100644 void ObexFtpDaemon::interfaceRemoved(const QDBusObjectPath &dbusPath, const QStringList& interfaces) diff --git a/src/kio/obexftp/daemon/ObexFtpDaemon.h b/src/kio/obexftp/daemon/ObexFtpDaemon.h -index d56b73d..28c34ab 100644 +index d56b73da04cef4ba21fdcae9b332257c94c8df0f..28c34abb8a6e84ba68752289b8870b63ff4fd9ad 100644 --- a/src/kio/obexftp/daemon/ObexFtpDaemon.h +++ b/src/kio/obexftp/daemon/ObexFtpDaemon.h @@ -30,44 +30,28 @@ class QDBusMessage; @@ -3630,7 +2919,7 @@ index d56b73d..28c34ab 100644 struct Private; diff --git a/src/kio/obexftp/daemon/createsessionjob.cpp b/src/kio/obexftp/daemon/createsessionjob.cpp -index 2eba356..c019156 100644 +index 2eba3566a0cd971ba88eba27d11db3f6d5d2bb95..c0191563d99d2a071a823666be00d3ef6c8981eb 100644 --- a/src/kio/obexftp/daemon/createsessionjob.cpp +++ b/src/kio/obexftp/daemon/createsessionjob.cpp @@ -24,9 +24,10 @@ @@ -3687,7 +2976,7 @@ index 2eba356..c019156 100644 setErrorText(reply.error().message()); emitResult(); diff --git a/src/kio/obexftp/daemon/createsessionjob.h b/src/kio/obexftp/daemon/createsessionjob.h -index a457b02..667384b 100644 +index a457b0288993ac0ec4fa310e9350fb13f9bd2a85..667384bcc1602ecf2f2228e88318b3a03a517849 100644 --- a/src/kio/obexftp/daemon/createsessionjob.h +++ b/src/kio/obexftp/daemon/createsessionjob.h @@ -29,7 +29,7 @@ class CreateSessionJob : public KJob @@ -3712,66 +3001,8 @@ index a457b02..667384b 100644 -#endif //CREATE_SESSION_JOB_H \ No newline at end of file +#endif //CREATE_SESSION_JOB_H -diff --git a/src/kio/obexftp/daemon/obexftpdaemon.desktop b/src/kio/obexftp/daemon/obexftpdaemon.desktop -index 07b7b2e..b23a6d1 100644 ---- a/src/kio/obexftp/daemon/obexftpdaemon.desktop -+++ b/src/kio/obexftp/daemon/obexftpdaemon.desktop -@@ -9,16 +9,20 @@ X-KDE-Kded-load-on-demand=true - X-KDE-Kded-phase=1 - - Name=Bluetooth File Transfer -+Name[bs]=Transfer Bluetooth Daoteke - Name[ca]=Transferència de fitxer per Bluetooth - Name[cs]=Přenos souborů Bluetooth - Name[de]=Bluetooth-Dateiübertragung -+Name[el]=Μεταφορά αρχείων με Bluetooth - Name[en_GB]=Bluetooth File Transfer --Name[es]=Transferencia de archivos por Bluetooth -+Name[es]=Transferencia de archivo por Bluetooth -+Name[et]=Bluetoothi failiedastus - Name[fi]=Bluetooth-tiedostonsiirto - Name[fr]=Transfert de fichiers Bluetooth - Name[it]=Trasferimento file via Bluetooth - Name[nb]=Blåtann filoverføring - Name[nl]=Bestandsoverdracht via bluetooth -+Name[pa]=ਬਲਿਊਟੁੱਥ ਫਾਇਲ ਟਰਾਂਸਫਰ - Name[pl]=Przesyłanie plików Bluetooth - Name[pt]=Transferência de Ficheiros por Bluetooth - Name[pt_BR]=Transferência de arquivos por Bluetooth -@@ -29,16 +33,21 @@ Name[sr@ijekavian]=Блутут пренос фајла - Name[sr@ijekavianlatin]=Bluetooth prenos fajla - Name[sr@latin]=Bluetooth prenos fajla - Name[sv]=Filöverföring med Blåtand -+Name[tr]=Bluetooth Dosya Aktarımı - Name[uk]=Перенесення файла за допомогою Bluetooth - Name[x-test]=xxBluetooth File Transferxx - Name[zh_CN]=蓝牙文件传输 -+Name[zh_TW]=藍牙檔案傳輸 - - Comment=Supports Bluetooth file transfer using ObexFTP -+Comment[bs]=Podržava Blutut prijenos datoteka koristeći ObexFTP - Comment[ca]=Accepta transferència de fitxer per Bluetooth usant ObexFTP - Comment[cs]=Podporuje přenos souborů Bluetooth použitím ObexFTP - Comment[de]=Unterstützt Bluetooth-Datenübertragung mittels ObexFTP -+Comment[el]=Υποστηρίζει μεταφορά αρχείων με Bluetooth με χρήση ObexFTP - Comment[en_GB]=Supports Bluetooth file transfer using ObexFTP --Comment[es]=Permite la transferencia de archivos por Bluetooth usando ObexFTP -+Comment[es]=Permite transferencias de archivos por Bluetooth usando ObexFTP -+Comment[et]=Bluetoothi failiedastuse toetamine ObexFTP vahendusel - Comment[fi]=Tukee Bluetooth-tiedostonsiirtoa ObexFTP:tä käyttäen - Comment[fr]=Prend en charge le transfert de fichiers Bluetooth à l'aide de « ObexFTP » - Comment[it]=Supporta i trasferimenti di file Bluetooth usando ObexFTP -@@ -54,6 +63,8 @@ Comment[sr@ijekavian]=Подршка за блутут преносе фајло - Comment[sr@ijekavianlatin]=Podrška za bluetooth prenose fajlova pomoću ObexFTP‑a - Comment[sr@latin]=Podrška za bluetooth prenose fajlova pomoću ObexFTP‑a - Comment[sv]=Stöder filöverföringar för Blåtand med ObexFTP -+Comment[tr]=ObexFTP kullanarak Bluetooth dosya transferlerini destekler - Comment[uk]=Підтримує перенесення файлів Bluetooth за допомогою ObexFTP - Comment[x-test]=xxSupports Bluetooth file transfer using ObexFTPxx - Comment[zh_CN]=支持使用 ObexFTP 进行蓝牙文件传输 -+Comment[zh_TW]=使用 ObexFTP 支援藍牙檔案傳輸 diff --git a/src/kio/obexftp/kded_obexftp.xml b/src/kio/obexftp/kded_obexftp.xml -index 24c6c5c..06e3b14 100644 +index 24c6c5cc196574c7a9f3d42290d5d48af43178c3..06e3b1442ee48c8cda816867b0749ab58413e832 100644 --- a/src/kio/obexftp/kded_obexftp.xml +++ b/src/kio/obexftp/kded_obexftp.xml @@ -3,9 +3,17 @@ @@ -3795,7 +3026,7 @@ index 24c6c5c..06e3b14 100644 \ No newline at end of file + diff --git a/src/kio/obexftp/kio_obexftp.cpp b/src/kio/obexftp/kio_obexftp.cpp -index b5b93d8..17eefec 100644 +index b5b93d81e3a563af3aff2fedac37babaa420108e..17eefec61bba3998bf5f159f468cb2f34f586561 100644 --- a/src/kio/obexftp/kio_obexftp.cpp +++ b/src/kio/obexftp/kio_obexftp.cpp @@ -61,16 +61,21 @@ static QString urlFileName(const QUrl &url) @@ -4338,7 +3569,7 @@ index b5b93d8..17eefec 100644 + } } diff --git a/src/kio/obexftp/kio_obexftp.h b/src/kio/obexftp/kio_obexftp.h -index 3215fda..eefda10 100644 +index 3215fda218c83527ada97d489d00437fedb5e5c1..eefda10852a14475490d6e9cad416d8195bd1d49 100644 --- a/src/kio/obexftp/kio_obexftp.h +++ b/src/kio/obexftp/kio_obexftp.h @@ -29,6 +29,8 @@ @@ -4399,7 +3630,7 @@ index 3215fda..eefda10 100644 #endif // KIO_OBEXFTP_H diff --git a/src/kio/obexftp/transferfilejob.cpp b/src/kio/obexftp/transferfilejob.cpp -index b6267e3..9a06534 100644 +index b6267e38fb47336e400fa378019e99aad93c4547..9a0653490766e94031e319115d30d9601967c00f 100644 --- a/src/kio/obexftp/transferfilejob.cpp +++ b/src/kio/obexftp/transferfilejob.cpp @@ -35,7 +35,6 @@ TransferFileJob::TransferFileJob(const QString& path, KioFtp* parent) @@ -4446,7 +3677,7 @@ index b6267e3..9a06534 100644 return; } diff --git a/src/kio/obexftp/transferfilejob.h b/src/kio/obexftp/transferfilejob.h -index d82cd30..d594359 100644 +index d82cd307a5d7a81a2f2a05092d69e3583be48516..d594359544e0139ae51852a288edf98c2708a9a6 100644 --- a/src/kio/obexftp/transferfilejob.h +++ b/src/kio/obexftp/transferfilejob.h @@ -39,7 +39,6 @@ public: @@ -4465,7 +3696,7 @@ index d82cd30..d594359 100644 \ No newline at end of file +#endif //KIO_GET_FILE_JOB_H diff --git a/src/monolithic/CMakeLists.txt b/src/monolithic/CMakeLists.txt -index f39964e..685e30f 100644 +index f39964ea5c3c9b69af93a6ff9e1557069ad017c2..685e30f6ae0e11ae95c2285f119e540ecb45185f 100644 --- a/src/monolithic/CMakeLists.txt +++ b/src/monolithic/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(bluedevil-monolithic @@ -4474,93 +3705,8 @@ index f39964e..685e30f 100644 install(TARGETS bluedevil-monolithic ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES bluedevil-monolithic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES org.kde.bluedevilmonolithic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -diff --git a/src/monolithic/bluedevil-monolithic.desktop b/src/monolithic/bluedevil-monolithic.desktop -deleted file mode 100644 -index 3911e87..0000000 ---- a/src/monolithic/bluedevil-monolithic.desktop -+++ /dev/null -@@ -1,79 +0,0 @@ --[Desktop Entry] --Type=Application --Version=1.0 --Name=BlueDevil --Name[ca]=BlueDevil --Name[cs]=BlueDevil --Name[de]=BlueDevil --Name[en_GB]=BlueDevil --Name[es]=BlueDevil --Name[fi]=BlueDevil --Name[fr]=BlueDevil --Name[it]=BlueDevil --Name[nb]=BlueDevil --Name[nl]=BlueDevil --Name[pl]=BlueDevil --Name[pt]=BlueDevil --Name[pt_BR]=BlueDevil --Name[sk]=BlueDevil --Name[sl]=BlueDevil --Name[sr]=Блудевил --Name[sr@ijekavian]=Блудевил --Name[sr@ijekavianlatin]=BlueDevil --Name[sr@latin]=BlueDevil --Name[sv]=Blådjävul --Name[uk]=BlueDevil --Name[x-test]=xxBlueDevilxx --Name[zh_CN]=BlueDevil --GenericName=BlueDevil --GenericName[ca]=BlueDevil --GenericName[cs]=BlueDevil --GenericName[de]=BlueDevil --GenericName[en_GB]=BlueDevil --GenericName[es]=BlueDevil --GenericName[fi]=BlueDevil --GenericName[fr]=BlueDevil --GenericName[it]=BlueDevil --GenericName[nb]=BlueDevil --GenericName[nl]=BlueDevil --GenericName[pl]=BlueDevil --GenericName[pt]=BlueDevil --GenericName[pt_BR]=BlueDevil --GenericName[sk]=BlueDevil --GenericName[sl]=BlueDevil --GenericName[sr]=Блудевил --GenericName[sr@ijekavian]=Блудевил --GenericName[sr@ijekavianlatin]=BlueDevil --GenericName[sr@latin]=BlueDevil --GenericName[sv]=Blådjävul --GenericName[uk]=BlueDevil --GenericName[x-test]=xxBlueDevilxx --GenericName[zh_CN]=BlueDevil --Exec=bluedevil-monolithic --Comment=KDE Bluetooth support --Comment[ca]=Implementació Bluetooth del KDE --Comment[cs]=Podpora Bluetooth v KDE --Comment[de]=KDE-Bluetooth-Unterstützung --Comment[en_GB]=KDE Bluetooth support --Comment[es]=Implementación Bluetooth para KDE --Comment[fi]=KDE:n Bluetooth-tuki --Comment[fr]=Prise en charge de Bluetooth pour KDE --Comment[it]=Supporto Bluetooth per KDE --Comment[nb]=KDE Blåtann-støtte --Comment[nl]=KDE Bluetooth ondersteuning --Comment[pl]=Obsługa Bluetooth w KDE --Comment[pt]=Suporte para Bluetooth no KDE --Comment[pt_BR]=Suporte para Bluetooth do KDE --Comment[sk]=Podpora Bluetooth KDE --Comment[sl]=KDE-jeva podpora za Bluetooth --Comment[sr]=Подршка блутута у КДЕ‑у --Comment[sr@ijekavian]=Подршка блутута у КДЕ‑у --Comment[sr@ijekavianlatin]=Podrška Bluetootha u KDE‑u --Comment[sr@latin]=Podrška Bluetootha u KDE‑u --Comment[sv]=KDE:s Blåtandstöd --Comment[uk]=Підтримка Bluetooth у KDE --Comment[x-test]=xxKDE Bluetooth supportxx --Comment[zh_CN]=KDE 蓝牙支持 --Icon=preferences-system-bluetooth --Terminal=false --Categories=Qt;KDE;X-Bluetooth;Network; diff --git a/src/monolithic/main.cpp b/src/monolithic/main.cpp -index ae560a7..13ae42e 100644 +index ae560a7c7f8c741c1bb01112782e787da3af3b1d..13ae42eebe10c322e4dbcbd2d1b4be6589c65910 100644 --- a/src/monolithic/main.cpp +++ b/src/monolithic/main.cpp @@ -42,11 +42,11 @@ int main(int argc, char *argv[]) @@ -4587,7 +3733,7 @@ index ae560a7..13ae42e 100644 return app.exec(); diff --git a/src/monolithic/monolithic.cpp b/src/monolithic/monolithic.cpp -index 5480752..fb6a23c 100644 +index 548075235e6a82ac6dc349b26866d17bcc0e41e3..fb6a23cbd5fcd0f3aa339a69e0151be1c0f92db9 100644 --- a/src/monolithic/monolithic.cpp +++ b/src/monolithic/monolithic.cpp @@ -47,7 +47,7 @@ Monolithic::Monolithic(QObject* parent) @@ -4638,7 +3784,7 @@ index 5480752..fb6a23c 100644 QMenu *const menu = contextMenu(); diff --git a/src/monolithic/monolithic.h b/src/monolithic/monolithic.h -index 00baf1b..cb13cad 100644 +index 00baf1bbafea44953439727f561e9cec23c1d1a4..cb13cadb4b6a8763e088c01af393b16fa0fcf6ee 100644 --- a/src/monolithic/monolithic.h +++ b/src/monolithic/monolithic.h @@ -22,7 +22,8 @@ @@ -4663,7 +3809,7 @@ index 00baf1b..cb13cad 100644 Q_OBJECT diff --git a/src/monolithic/org.kde.bluedevilmonolithic.desktop b/src/monolithic/org.kde.bluedevilmonolithic.desktop new file mode 100644 -index 0000000..f4572ef +index 0000000000000000000000000000000000000000..f4572ef1765b0bf262c545505d2a6e98fd3c3a6f --- /dev/null +++ b/src/monolithic/org.kde.bluedevilmonolithic.desktop @@ -0,0 +1,98 @@ @@ -4766,7 +3912,7 @@ index 0000000..f4572ef +X-DBUS-StartupType=Unique +X-DBUS-ServiceName=org.kde.bluedevilmonolithic diff --git a/src/sendfile/CMakeLists.txt b/src/sendfile/CMakeLists.txt -index 9004cbe..c0ea4c7 100644 +index 9004cbe2b7d7828711a8d70c13fc99de5efa3693..c0ea4c72544a998ca06ba6b32e600b749ca3b069 100644 --- a/src/sendfile/CMakeLists.txt +++ b/src/sendfile/CMakeLists.txt @@ -32,10 +32,11 @@ target_link_libraries(bluedevil-sendfile @@ -4782,95 +3928,8 @@ index 9004cbe..c0ea4c7 100644 install(TARGETS bluedevil-sendfile DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES bluedevil-sendfile.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES org.kde.bluedevilsendfile.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -diff --git a/src/sendfile/bluedevil-sendfile.desktop b/src/sendfile/bluedevil-sendfile.desktop -deleted file mode 100644 -index 4e7169e..0000000 ---- a/src/sendfile/bluedevil-sendfile.desktop -+++ /dev/null -@@ -1,81 +0,0 @@ --[Desktop Entry] --Type=Application --Version=1.0 --Name=BlueDevil Send File --Name[ca]=Envia fitxer amb BlueDevil --Name[cs]=Posílání souborů BlueDevil --Name[de]=BlueDevil-Dateiversand --Name[en_GB]=BlueDevil Send File --Name[es]=Enviar archivo con BlueDevil --Name[fi]=BlueDevil-tiedostonlähetys --Name[fr]=Envoi de fichiers par BlueDevil --Name[it]=Invio file di BlueDevil --Name[nb]=BlueDevil send fil --Name[nl]=BlueDevil bestand verzenden --Name[pl]=Wysłanie pliku BlueDevil --Name[pt]=Envio de Ficheiro do Bluetooth --Name[pt_BR]=Envio de arquivo do BlueDevil --Name[sk]=Posielanie súborov BlueDevil --Name[sl]=BlueDevil – pošiljanje datotek --Name[sr]=Блудевилово слање фајла --Name[sr@ijekavian]=Блудевилово слање фајла --Name[sr@ijekavianlatin]=BlueDevilovo slanje fajla --Name[sr@latin]=BlueDevilovo slanje fajla --Name[sv]=Blådjävul skicka fil --Name[uk]=Надсилання файла BlueDevil --Name[x-test]=xxBlueDevil Send Filexx --Name[zh_CN]=BlueDevil 发送文件 --GenericName=BlueDevil Send File --GenericName[ca]=Envia fitxers amb BlueDevil --GenericName[cs]=Posílání souborů BlueDevil --GenericName[de]=BlueDevil-Dateiversand --GenericName[en_GB]=BlueDevil Send File --GenericName[es]=Enviar archivo con BlueDevil --GenericName[fi]=BlueDevil-tiedostonlähetys --GenericName[fr]=Envoi de fichiers par BlueDevil --GenericName[it]=Invio file di BlueDevil --GenericName[nb]=BlueDevil send fil --GenericName[nl]=BlueDevil bestand verzenden --GenericName[pl]=Wysłanie pliku BlueDevil --GenericName[pt]=Envio de Ficheiro do Bluetooth --GenericName[pt_BR]=Envio de arquivo do BlueDevil --GenericName[sk]=Posielanie súborov BlueDevil --GenericName[sl]=BlueDevil – pošiljanje datotek --GenericName[sr]=Блудевилово слање фајла --GenericName[sr@ijekavian]=Блудевилово слање фајла --GenericName[sr@ijekavianlatin]=BlueDevilovo slanje fajla --GenericName[sr@latin]=BlueDevilovo slanje fajla --GenericName[sv]=Blådjävul skicka fil --GenericName[uk]=Надсилання файла BlueDevil --GenericName[x-test]=xxBlueDevil Send Filexx --GenericName[zh_CN]=BlueDevil 发送文件 --MimeType=application/vnd.kde.bluedevil-sendfile; --Exec=bluedevil-sendfile -k%U --Comment=BlueDevil Send File --Comment[ca]=Envia fitxers amb BlueDevil --Comment[cs]=Posílání souborů BlueDevil --Comment[de]=BlueDevil-Dateiversand --Comment[en_GB]=BlueDevil Send File --Comment[es]=Enviar archivo con BlueDevil --Comment[fi]=BlueDevil-tiedostonlähetys --Comment[fr]=Envoi de fichiers par BlueDevil --Comment[it]=Invio file di BlueDevil --Comment[nb]=BlueDevil send fil --Comment[nl]=BlueDevil bestand verzenden --Comment[pl]=Wysłanie pliku BlueDevil --Comment[pt]=Envio de Ficheiro do Bluetooth --Comment[pt_BR]=Envio de arquivo do BlueDevil --Comment[sk]=Posielanie súborov BlueDevil --Comment[sl]=BlueDevil – pošiljanje datotek --Comment[sr]=Блудевилово слање фајла --Comment[sr@ijekavian]=Блудевилово слање фајла --Comment[sr@ijekavianlatin]=BlueDevilovo slanje fajla --Comment[sr@latin]=BlueDevilovo slanje fajla --Comment[sv]=Blådjävul skicka fil --Comment[uk]=Надсилання файла BlueDevil --Comment[x-test]=xxBlueDevil Send Filexx --Comment[zh_CN]=BlueDevil 发送文件 --Icon=preferences-system-bluetooth --Terminal=false --Categories=Qt;KDE;X-Bluetooth;Network; --NoDisplay=true diff --git a/src/sendfile/discoverwidget.cpp b/src/sendfile/discoverwidget.cpp -index 903da16..4cb5af9 100644 +index 903da161c7c9e76e02bfa44628c532c41686d3ad..4cb5af9471e7fae5688818700153deb10489847a 100644 --- a/src/sendfile/discoverwidget.cpp +++ b/src/sendfile/discoverwidget.cpp @@ -20,9 +20,9 @@ @@ -4972,7 +4031,7 @@ index 903da16..4cb5af9 100644 emit deviceSelected(Manager::self()->usableAdapter()->deviceForAddress(item->data(Qt::UserRole).toString())); } diff --git a/src/sendfile/discoverwidget.h b/src/sendfile/discoverwidget.h -index d1cc03b..3516c61 100644 +index d1cc03bb6decf90df8754c4c8d8f9e062aca3311..3516c61901b09652d49c67776dc3ffb8c0811cdb 100644 --- a/src/sendfile/discoverwidget.h +++ b/src/sendfile/discoverwidget.h @@ -20,7 +20,6 @@ @@ -5030,7 +4089,7 @@ index d1cc03b..3516c61 100644 #endif // DISCOVERWIDGET_H diff --git a/src/sendfile/main.cpp b/src/sendfile/main.cpp -index 1b1bb8b..4f593d3 100644 +index 1b1bb8bdd8b709ecf4478769d2c6e2f175fbfa57..4f593d37e728b563c668a7cdd0ea72a4d9fdfd98 100644 --- a/src/sendfile/main.cpp +++ b/src/sendfile/main.cpp @@ -25,6 +25,7 @@ @@ -5075,7 +4134,7 @@ index 1b1bb8b..4f593d3 100644 } diff --git a/src/sendfile/org.kde.bluedevilsendfile.desktop b/src/sendfile/org.kde.bluedevilsendfile.desktop new file mode 100644 -index 0000000..d976633 +index 0000000000000000000000000000000000000000..d976633fa00c3439184bc71a5ba57dfb71911f57 --- /dev/null +++ b/src/sendfile/org.kde.bluedevilsendfile.desktop @@ -0,0 +1,94 @@ @@ -5174,7 +4233,7 @@ index 0000000..d976633 +Categories=Qt;KDE;X-Bluetooth;Network; +X-DBUS-ServiceName=org.kde.bluedevilsendfile diff --git a/src/sendfile/pages/connecting.ui b/src/sendfile/pages/connecting.ui -index 10d9d7e..fc2bf06 100644 +index 10d9d7ea41d62efdd50146d715508f3cc6c6be34..fc2bf06b3c33b0604f2479b2bec85e7034daafa4 100644 --- a/src/sendfile/pages/connecting.ui +++ b/src/sendfile/pages/connecting.ui @@ -12,11 +12,7 @@ @@ -5191,7 +4250,7 @@ index 10d9d7e..fc2bf06 100644 diff --git a/src/sendfile/pages/connectingpage.cpp b/src/sendfile/pages/connectingpage.cpp -index 8d18c3d..1c34ed5 100644 +index 8d18c3dfecd5f513f088dd53d2f1d2eeddeb2dfd..1c34ed5f555951c190fe2683ae5f7f579573ca55 100644 --- a/src/sendfile/pages/connectingpage.cpp +++ b/src/sendfile/pages/connectingpage.cpp @@ -29,7 +29,8 @@ @@ -5205,7 +4264,7 @@ index 8d18c3d..1c34ed5 100644 setupUi(this); } diff --git a/src/sendfile/pages/connectingpage.h b/src/sendfile/pages/connectingpage.h -index 935b394..2834cfa 100644 +index 935b394bd40cfef8ecbd6687d8c2f76cb23237ca..2834cfafc4626171d4ca569c9f9d5321b548e26b 100644 --- a/src/sendfile/pages/connectingpage.h +++ b/src/sendfile/pages/connectingpage.h @@ -27,15 +27,14 @@ @@ -5230,7 +4289,7 @@ index 935b394..2834cfa 100644 #endif // CONNECTINGPAGE_H diff --git a/src/sendfile/pages/selectdeviceandfilespage.cpp b/src/sendfile/pages/selectdeviceandfilespage.cpp -index 0c8d079..b22d907 100644 +index 0c8d07976dbee6beff8aba7f23be698d4da0a4b3..b22d90729225f99296a142894ebb4decc865f63a 100644 --- a/src/sendfile/pages/selectdeviceandfilespage.cpp +++ b/src/sendfile/pages/selectdeviceandfilespage.cpp @@ -39,7 +39,10 @@ @@ -5285,7 +4344,7 @@ index 0c8d079..b22d907 100644 } diff --git a/src/sendfile/pages/selectdeviceandfilespage.h b/src/sendfile/pages/selectdeviceandfilespage.h -index 19a718b..f5b50fc 100644 +index 19a718b684bf7239cce19f7ef3fa1a0ea90ea53d..f5b50fccbfce8c64996dccdfcee6f7451dc6da47 100644 --- a/src/sendfile/pages/selectdeviceandfilespage.h +++ b/src/sendfile/pages/selectdeviceandfilespage.h @@ -31,22 +31,22 @@ class KUrl; @@ -5320,7 +4379,7 @@ index 19a718b..f5b50fc 100644 void selectionChanged(); diff --git a/src/sendfile/pages/selectdevicepage.cpp b/src/sendfile/pages/selectdevicepage.cpp -index 01423dd..69a2c84 100644 +index 01423ddbae316d07c1f8d13292aa71a771141bd4..69a2c84f9d7f800894c15f99378ac1d9901ec9a1 100644 --- a/src/sendfile/pages/selectdevicepage.cpp +++ b/src/sendfile/pages/selectdevicepage.cpp @@ -36,7 +36,10 @@ @@ -5364,7 +4423,7 @@ index 01423dd..69a2c84 100644 } diff --git a/src/sendfile/pages/selectdevicepage.h b/src/sendfile/pages/selectdevicepage.h -index 8c4b494..18d2cc7 100644 +index 8c4b494a2515118d95954f14feeb437fcd9204e1..18d2cc7ba7bba95e6878fb2e5bcabe8ee7b57fd7 100644 --- a/src/sendfile/pages/selectdevicepage.h +++ b/src/sendfile/pages/selectdevicepage.h @@ -30,22 +30,23 @@ @@ -5400,7 +4459,7 @@ index 8c4b494..18d2cc7 100644 private: KFileDialog *m_dialog; diff --git a/src/sendfile/pages/selectfilespage.cpp b/src/sendfile/pages/selectfilespage.cpp -index 7362eef..56ba9af 100644 +index 7362eef89f8125209c6a16342434989d18e91bbd..56ba9afdede07fb74379b63433a66b17eb1eb9f4 100644 --- a/src/sendfile/pages/selectfilespage.cpp +++ b/src/sendfile/pages/selectfilespage.cpp @@ -31,14 +31,15 @@ @@ -5437,7 +4496,7 @@ index 7362eef..56ba9af 100644 } diff --git a/src/sendfile/pages/selectfilespage.h b/src/sendfile/pages/selectfilespage.h -index a802270..623a216 100644 +index a8022706dad98b01362e0eec903946fcd4407587..623a21648446516b6816a843597dc6d285bc5cdb 100644 --- a/src/sendfile/pages/selectfilespage.h +++ b/src/sendfile/pages/selectfilespage.h @@ -30,11 +30,12 @@ class KFileWidget; @@ -5457,7 +4516,7 @@ index a802270..623a216 100644 private Q_SLOTS: void selectionChanged(); diff --git a/src/sendfile/sendfilesjob.cpp b/src/sendfile/sendfilesjob.cpp -index 554616b..c943ef0 100644 +index 554616b35a63ac8806b0193f0eaf0d38d823b8ec..c943ef0d14880d733160de3ea0f673a89b9f99bc 100644 --- a/src/sendfile/sendfilesjob.cpp +++ b/src/sendfile/sendfilesjob.cpp @@ -31,7 +31,8 @@ @@ -5600,7 +4659,7 @@ index 554616b..c943ef0 100644 - } diff --git a/src/sendfile/sendfilesjob.h b/src/sendfile/sendfilesjob.h -index 28e8ac2..68580c0 100644 +index 28e8ac249d1e94c0f8af22473a23435cfb204733..68580c092790576afcec540c2d242c9fad34a755 100644 --- a/src/sendfile/sendfilesjob.h +++ b/src/sendfile/sendfilesjob.h @@ -40,15 +40,14 @@ class OrgBluezObexClient1Interface; @@ -5661,7 +4720,7 @@ index 28e8ac2..68580c0 100644 OrgBluezObexClient1Interface *m_client; OrgBluezObexObjectPush1Interface *m_push; diff --git a/src/sendfile/sendfilewizard.cpp b/src/sendfile/sendfilewizard.cpp -index 6557989..71b01ea 100644 +index 655798965a60dbd26def72f6cf5f35f1f1354308..71b01ea4a8abc9112ac0026b63df788b95ded415 100644 --- a/src/sendfile/sendfilewizard.cpp +++ b/src/sendfile/sendfilewizard.cpp @@ -41,7 +41,7 @@ @@ -5722,7 +4781,7 @@ index 6557989..71b01ea 100644 } - diff --git a/src/sendfile/sendfilewizard.h b/src/sendfile/sendfilewizard.h -index 9b425e2..1dae831 100644 +index 9b425e2d6b6d7c773f72eeb7020346bd358965e1..1dae831e2a18455259207d733d60ad38fc1465b7 100644 --- a/src/sendfile/sendfilewizard.h +++ b/src/sendfile/sendfilewizard.h @@ -31,26 +31,27 @@ @@ -5774,7 +4833,7 @@ index 9b425e2..1dae831 100644 }; diff --git a/src/settings/filereceiver.kcfg b/src/settings/filereceiver.kcfg -index 5740f9a..a2e6521 100644 +index 5740f9a04c944820a85610b249a52ccf9b51b08d..a2e6521563e4a74cb4ed7fbdaa629ef177b54f1d 100644 --- a/src/settings/filereceiver.kcfg +++ b/src/settings/filereceiver.kcfg @@ -3,14 +3,9 @@ @@ -5803,7 +4862,7 @@ index 5740f9a..a2e6521 100644 diff --git a/src/wizard/CMakeLists.txt b/src/wizard/CMakeLists.txt -index d615f3d..e096ad1 100644 +index d615f3db4c854da479ac936971d7760f560ae80b..e096ad1df3eaf04c1c775c099df7484f67808d33 100644 --- a/src/wizard/CMakeLists.txt +++ b/src/wizard/CMakeLists.txt @@ -11,6 +11,7 @@ set(wizard_SRCS @@ -5829,94 +4888,8 @@ index d615f3d..e096ad1 100644 -install(FILES bluedevil-wizard.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES org.kde.bluedevilwizard.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES pin-code-database.xml DESTINATION ${DATA_INSTALL_DIR}/bluedevilwizard) -diff --git a/src/wizard/bluedevil-wizard.desktop b/src/wizard/bluedevil-wizard.desktop -deleted file mode 100644 -index c349f89..0000000 ---- a/src/wizard/bluedevil-wizard.desktop -+++ /dev/null -@@ -1,80 +0,0 @@ --[Desktop Entry] --Type=Application --Version=1.0 --Name=BlueDevil Wizard --Name[ca]=Assistent del BlueDevil --Name[cs]=Průvodce Bluedevil --Name[de]=BlueDevil-Assistent --Name[en_GB]=BlueDevil Wizard --Name[es]=Asistente de BlueDevil --Name[fi]=Opastettu BlueDevil-toiminto --Name[fr]=Assistant pour BlueDevil --Name[it]=Procedura guidata di BlueDevil --Name[nb]=BlueDevil veiviser --Name[nl]=BlueDevil assistent --Name[pl]=Pomocnik BlueDevil --Name[pt]=Assistente BlueDevil --Name[pt_BR]=Assistente BlueDevil --Name[sk]=Sprievodca BlueDevil --Name[sl]=BlueDevil – čarovnik --Name[sr]=Блудевилов чаробњак --Name[sr@ijekavian]=Блудевилов чаробњак --Name[sr@ijekavianlatin]=BlueDevilov čarobnjak --Name[sr@latin]=BlueDevilov čarobnjak --Name[sv]=Blådjävul guide --Name[uk]=Майстер BlueDevil --Name[x-test]=xxBlueDevil Wizardxx --Name[zh_CN]=BlueDevil 向导 --GenericName=BlueDevil Wizard --GenericName[ca]=Assistent del BlueDevil --GenericName[cs]=Průvodce Bluedevil --GenericName[de]=BlueDevil-Assistent --GenericName[en_GB]=BlueDevil Wizard --GenericName[es]=Asistente de BlueDevil --GenericName[fi]=Opastettu BlueDevil-toiminto --GenericName[fr]=Assistant pour BlueDevil --GenericName[it]=Procedura guidata di BlueDevil --GenericName[nb]=BlueDevil veiviser --GenericName[nl]=BlueDevil assistent --GenericName[pl]=Pomocnik BlueDevil --GenericName[pt]=Assistente BlueDevil --GenericName[pt_BR]=Assistente BlueDevil --GenericName[sk]=Sprievodca BlueDevil --GenericName[sl]=BlueDevil – čarovnik --GenericName[sr]=Блудевилов чаробњак --GenericName[sr@ijekavian]=Блудевилов чаробњак --GenericName[sr@ijekavianlatin]=BlueDevilov čarobnjak --GenericName[sr@latin]=BlueDevilov čarobnjak --GenericName[sv]=Blådjävul guide --GenericName[uk]=Майстер BlueDevil --GenericName[x-test]=xxBlueDevil Wizardxx --GenericName[zh_CN]=BlueDevil 向导 --Exec=bluedevil-wizard %U --Comment=BlueDevil Wizard --Comment[ca]=Assistent del BlueDevil --Comment[cs]=BlueDevil --Comment[de]=BlueDevil-Assistent --Comment[en_GB]=BlueDevil Wizard --Comment[es]=Asistente de BlueDevil --Comment[fi]=Opastettu BlueDevil-toiminto --Comment[fr]=Assistant pour BlueDevil --Comment[it]=Procedura guidata di BlueDevil --Comment[nb]=BlueDevil veiviser --Comment[nl]=BlueDevil assistent --Comment[pl]=Pomocnik BlueDevil --Comment[pt]=Assistente BlueDevil --Comment[pt_BR]=Assistente BlueDevil --Comment[sk]=Sprievodca BlueDevil --Comment[sl]=BlueDevil – čarovnik --Comment[sr]=Блудевилов чаробњак --Comment[sr@ijekavian]=Блудевилов чаробњак --Comment[sr@ijekavianlatin]=BlueDevilov čarobnjak --Comment[sr@latin]=BlueDevilov čarobnjak --Comment[sv]=Blådjävul guide --Comment[uk]=Майстер BlueDevil --Comment[x-test]=xxBlueDevil Wizardxx --Comment[zh_CN]=BlueDevil 向导 --Icon=preferences-system-bluetooth --Terminal=false --Categories=Qt;KDE;X-Bluetooth;Network; --NoDisplay=true diff --git a/src/wizard/bluewizard.cpp b/src/wizard/bluewizard.cpp -index 02f54b7..2f1e62a 100644 +index 02f54b7f141d852cb51057521b6d3896aadf1f49..2f1e62a0e84e46fd35be409175f22c1b36eb90c7 100644 --- a/src/wizard/bluewizard.cpp +++ b/src/wizard/bluewizard.cpp @@ -23,6 +23,7 @@ @@ -6039,7 +5012,7 @@ index 02f54b7..2f1e62a 100644 return m_agent; } diff --git a/src/wizard/bluewizard.h b/src/wizard/bluewizard.h -index ce817d1..e930916 100644 +index ce817d164609ce2fc1b54cc0eb0a2a18e90dd51f..e930916919ad222eba5030a0d18ff27a1e35f926 100644 --- a/src/wizard/bluewizard.h +++ b/src/wizard/bluewizard.h @@ -15,57 +15,66 @@ @@ -6132,7 +5105,7 @@ index ce817d1..e930916 100644 }; diff --git a/src/wizard/main.cpp b/src/wizard/main.cpp -index ee9edf8..80e260b 100644 +index ee9edf80f8916dfaaffe98724d99ccf4aa2320f1..80e260b0cc650328520bcfcd2076b4adbcdbf3e7 100644 --- a/src/wizard/main.cpp +++ b/src/wizard/main.cpp @@ -28,6 +28,7 @@ @@ -6181,7 +5154,7 @@ index ee9edf8..80e260b 100644 } diff --git a/src/wizard/org.kde.bluedevilwizard.desktop b/src/wizard/org.kde.bluedevilwizard.desktop new file mode 100644 -index 0000000..8e89f30 +index 0000000000000000000000000000000000000000..8e89f302bbd2c1a4a9b6efb5d7e36a63272482bf --- /dev/null +++ b/src/wizard/org.kde.bluedevilwizard.desktop @@ -0,0 +1,99 @@ @@ -6285,7 +5258,7 @@ index 0000000..8e89f30 +X-DBUS-StartupType=Unique +X-DBUS-ServiceName=org.kde.bluedevilwizard diff --git a/src/wizard/pages/discover.ui b/src/wizard/pages/discover.ui -index c43f080..aec410d 100644 +index c43f080e49649130f01911141bf9e03509496cb4..aec410db9fbcc8e84273cba0ab95de85b4133b4d 100644 --- a/src/wizard/pages/discover.ui +++ b/src/wizard/pages/discover.ui @@ -114,9 +114,6 @@ @@ -6299,7 +5272,7 @@ index c43f080..aec410d 100644 false diff --git a/src/wizard/pages/discoverpage.cpp b/src/wizard/pages/discoverpage.cpp -index de3f10e..e52c885 100644 +index de3f10e4e77c5f051182274a923576d3e380b54e..e52c885d4dcbcac102d7cb1e7c68e72732f52697 100644 --- a/src/wizard/pages/discoverpage.cpp +++ b/src/wizard/pages/discoverpage.cpp @@ -26,6 +26,7 @@ @@ -6458,7 +5431,7 @@ index de3f10e..e52c885 100644 } diff --git a/src/wizard/pages/discoverpage.h b/src/wizard/pages/discoverpage.h -index 86afbea..5d310e7 100644 +index 86afbea7429e4f0a9da440c3ced66c415b24f9f2..5d310e7832dbd4dd1c0edecfdbd46d65d53e97a9 100644 --- a/src/wizard/pages/discoverpage.h +++ b/src/wizard/pages/discoverpage.h @@ -23,33 +23,34 @@ @@ -6508,7 +5481,7 @@ index 86afbea..5d310e7 100644 }; diff --git a/src/wizard/pages/fail.cpp b/src/wizard/pages/fail.cpp -index 422920f..6abbeeb 100644 +index 422920f7f57d0b8e399796c70af0b52bf74c99f6..6abbeeb8b85b55aa8e90e69d196cb85f11ccb55b 100644 --- a/src/wizard/pages/fail.cpp +++ b/src/wizard/pages/fail.cpp @@ -35,20 +35,21 @@ @@ -6550,7 +5523,7 @@ index 422920f..6abbeeb 100644 - } diff --git a/src/wizard/pages/fail.h b/src/wizard/pages/fail.h -index 4b734c4..fa6378f 100644 +index 4b734c4e92121503b722e91d41ab9168bb6e0ad5..fa6378ffb2d82db5a1a0f9fd5f6ac7b534e9291b 100644 --- a/src/wizard/pages/fail.h +++ b/src/wizard/pages/fail.h @@ -29,7 +29,8 @@ @@ -6580,7 +5553,7 @@ index 4b734c4..fa6378f 100644 private: BlueWizard *m_wizard; diff --git a/src/wizard/pages/fail.ui b/src/wizard/pages/fail.ui -index 0470e8f..375a4fb 100644 +index 0470e8f44b3ba7aa77791ec42c6c7b111dc75832..375a4fb344dc3572d3a87bd3a7fc57a3084f799a 100644 --- a/src/wizard/pages/fail.ui +++ b/src/wizard/pages/fail.ui @@ -30,6 +30,16 @@ @@ -6601,7 +5574,7 @@ index 0470e8f..375a4fb 100644 diff --git a/src/wizard/pages/keyboardpairing.cpp b/src/wizard/pages/keyboardpairing.cpp -index 67c7f27..4b552ba 100644 +index 67c7f276534cae5da0888e9160b675611bdc54d0..4b552ba05ad81f31a648572cce93f625c7ba6967 100644 --- a/src/wizard/pages/keyboardpairing.cpp +++ b/src/wizard/pages/keyboardpairing.cpp @@ -35,11 +35,12 @@ @@ -6650,7 +5623,7 @@ index 67c7f27..4b552ba 100644 return list; } diff --git a/src/wizard/pages/keyboardpairing.h b/src/wizard/pages/keyboardpairing.h -index 14818f6..871295b 100644 +index 14818f605103fbf76cce2f402313d97e912c1526..871295b052ebb39a2f2488f93df0ebd748ac28bf 100644 --- a/src/wizard/pages/keyboardpairing.h +++ b/src/wizard/pages/keyboardpairing.h @@ -29,7 +29,8 @@ @@ -6696,7 +5669,7 @@ index 14818f6..871295b 100644 }; diff --git a/src/wizard/pages/legacypairing.cpp b/src/wizard/pages/legacypairing.cpp -index 898c699..943a107 100644 +index 898c6992baa7fdab3d95a6f0d301fc0f921ae515..943a107cef01b21ea0d489fde4abab0657d8094b 100644 --- a/src/wizard/pages/legacypairing.cpp +++ b/src/wizard/pages/legacypairing.cpp @@ -35,11 +35,12 @@ @@ -6750,7 +5723,7 @@ index 898c699..943a107 100644 return list; } diff --git a/src/wizard/pages/legacypairing.h b/src/wizard/pages/legacypairing.h -index f9ec3d4..671743b 100644 +index f9ec3d40b96954f411e0802ef15742a2d8dd6226..671743b6f63fb3e2484567b98534de489e1832e1 100644 --- a/src/wizard/pages/legacypairing.h +++ b/src/wizard/pages/legacypairing.h @@ -29,23 +29,22 @@ @@ -6794,7 +5767,7 @@ index f9ec3d4..671743b 100644 }; diff --git a/src/wizard/pages/legacypairingdatabase.cpp b/src/wizard/pages/legacypairingdatabase.cpp -index a31657c..61dcde0 100644 +index a31657c5d19fe5276b7eb09597de4187c6de51bb..61dcde0d20afb95644ab25501433d22f8b18caea 100644 --- a/src/wizard/pages/legacypairingdatabase.cpp +++ b/src/wizard/pages/legacypairingdatabase.cpp @@ -36,11 +36,12 @@ @@ -6835,7 +5808,7 @@ index a31657c..61dcde0 100644 return list; } diff --git a/src/wizard/pages/legacypairingdatabase.h b/src/wizard/pages/legacypairingdatabase.h -index 00c9d16..637c82e 100644 +index 00c9d16e849bdfd073be64f3d11a518ebc81b795..637c82ee9fa86f0eef8f68dcefd9487a47e191de 100644 --- a/src/wizard/pages/legacypairingdatabase.h +++ b/src/wizard/pages/legacypairingdatabase.h @@ -29,32 +29,31 @@ @@ -6881,7 +5854,7 @@ index 00c9d16..637c82e 100644 }; diff --git a/src/wizard/pages/nopairing.cpp b/src/wizard/pages/nopairing.cpp -index c0410e1..d4f1e45 100644 +index c0410e13f6c606c3c1415d97ce3a9ff71a36bd31..d4f1e45ff726508349e4fa401e7c9c47f3ac2c20 100644 --- a/src/wizard/pages/nopairing.cpp +++ b/src/wizard/pages/nopairing.cpp @@ -35,59 +35,52 @@ @@ -6975,7 +5948,7 @@ index c0410e1..d4f1e45 100644 return list; } diff --git a/src/wizard/pages/nopairing.h b/src/wizard/pages/nopairing.h -index 26f1441..1f0a8ab 100644 +index 26f1441d27da9a6eb017b946a2bbc31d694b9967..1f0a8ab13f426eda0061126d79fcb2ecb5499511 100644 --- a/src/wizard/pages/nopairing.h +++ b/src/wizard/pages/nopairing.h @@ -30,34 +30,31 @@ @@ -7023,7 +5996,7 @@ index 26f1441..1f0a8ab 100644 }; diff --git a/src/wizard/pages/ssppairing.cpp b/src/wizard/pages/ssppairing.cpp -index 963bdaa..d9e2b0a 100644 +index 963bdaa7be58df1b0ae2988312766537890055a8..d9e2b0a0c5185caead8f97fb0b76751ddb1557fe 100644 --- a/src/wizard/pages/ssppairing.cpp +++ b/src/wizard/pages/ssppairing.cpp @@ -38,12 +38,13 @@ @@ -7108,7 +6081,7 @@ index 963bdaa..d9e2b0a 100644 return list; } diff --git a/src/wizard/pages/ssppairing.h b/src/wizard/pages/ssppairing.h -index 9b7066d..1cd2aa8 100644 +index 9b7066d190397697abfcfe59dc6b1193240d1d04..1cd2aa8b398330b95f8204070d98ff52096414de 100644 --- a/src/wizard/pages/ssppairing.h +++ b/src/wizard/pages/ssppairing.h @@ -30,23 +30,22 @@ @@ -7161,7 +6134,7 @@ index 9b7066d..1cd2aa8 100644 diff --git a/src/wizard/pages/success.cpp b/src/wizard/pages/success.cpp new file mode 100644 -index 0000000..f49bb7f +index 0000000000000000000000000000000000000000..f49bb7fab2871d4807ce3396cddc3f053787736d --- /dev/null +++ b/src/wizard/pages/success.cpp @@ -0,0 +1,66 @@ @@ -7233,7 +6206,7 @@ index 0000000..f49bb7f +} diff --git a/src/wizard/pages/success.h b/src/wizard/pages/success.h new file mode 100644 -index 0000000..ba0d73c +index 0000000000000000000000000000000000000000..ba0d73c35301fcbb17643c36ce7ebe4576fba8f1 --- /dev/null +++ b/src/wizard/pages/success.h @@ -0,0 +1,46 @@ @@ -7285,7 +6258,7 @@ index 0000000..ba0d73c +#endif // SUCCESS_H diff --git a/src/wizard/pages/success.ui b/src/wizard/pages/success.ui new file mode 100644 -index 0000000..3630db3 +index 0000000000000000000000000000000000000000..3630db34a89ecaf7c6a6405113458c068dbe61be --- /dev/null +++ b/src/wizard/pages/success.ui @@ -0,0 +1,68 @@ @@ -7358,7 +6331,7 @@ index 0000000..3630db3 + + diff --git a/src/wizard/pin-code-database.xml b/src/wizard/pin-code-database.xml -index 8239aa9..5e99392 100644 +index 8239aa98a94ec27185c6c93f9fa8022dfc590caa..5e99392705936a96f3974c0f68b047f728dcb2c5 100644 --- a/src/wizard/pin-code-database.xml +++ b/src/wizard/pin-code-database.xml @@ -52,9 +52,9 @@ @@ -7375,7 +6348,7 @@ index 8239aa9..5e99392 100644