commit 0fd8671c0065a0123b7c40666e7d81d980f82353 Author: Jonathan Riddell Date: Tue May 23 12:08:40 2017 +0100 Update version number for 5.8.7 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index a7cee6bb..b00862f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(bluedevil) -set(PROJECT_VERSION "5.8.6") +set(PROJECT_VERSION "5.8.7") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12) commit ec37ebdcb5101b1f47e59dd7ce02ed574d5e54ae Author: l10n daemon script Date: Sun Apr 9 05:32:18 2017 +0200 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/src/kded/bluedevil.json b/src/kded/bluedevil.json index 3f5b7d0f..c4c8aa1b 100644 --- a/src/kded/bluedevil.json +++ b/src/kded/bluedevil.json @@ -1,52 +1,52 @@ { "KPlugin": { - "Description": "Handles Bluetooth events", - "Description[ar]": "يتعامل مع إجراءات بلوتوث", - "Description[ast]": "Remana eventos Bluetooth", - "Description[ca@valencia]": "Gestiona els esdeveniments del Bluetooth", - "Description[ca]": "Gestiona els esdeveniments del Bluetooth", - "Description[cs]": "Ovládá události Bluetooth", - "Description[da]": "Håndterer Bluetooth-hændelser", - "Description[de]": "Verarbeitung von Bluetooth-Ereignissen", - "Description[el]": "Διαχειρίζεται τα γεγονότα του Bluetooth", - "Description[es]": "Maneja eventos de Bluetooth", - "Description[et]": "Bluetoothi sündmuste käitlemine", - "Description[fi]": "Käsittelee Bluetooth-tapahtumia", - "Description[fr]": "Gère les évènements Bluetooth", - "Description[gl]": "Xestiona acontecementos de Bluetooth", - "Description[it]": "Gestisce gli eventi Bluetooth", - "Description[ko]": "블루투스 이벤트 처리", - "Description[nl]": "Behandelt bluetooth-gebeurtenissen", - "Description[nn]": "Handterer Bluetooth-hendingar", - "Description[pl]": "Obsługuje zdarzenia Bluetooth", - "Description[pt]": "Lida com os eventos do Bluetooth", - "Description[pt_BR]": "Lida com os eventos de Bluetooth", - "Description[ru]": "Обработчик событий Bluetooth", - "Description[sk]": "Spracúva udalosti Bluetooth", - "Description[sl]": "Obravnava dogodke za Bluetooth", - "Description[sr@ijekavian]": "Рукује блутут догађајима", - "Description[sr@ijekavianlatin]": "Rukuje bluetooth događajima", - "Description[sr@latin]": "Rukuje bluetooth događajima", - "Description[sr]": "Рукује блутут догађајима", - "Description[sv]": "Hanterar Blåtandhändelser", - "Description[uk]": "Обробляє події Bluetooth", - "Description[x-test]": "xxHandles Bluetooth eventsxx", - "Description[zh_CN]": "处理蓝牙事件", - "Description[zh_TW]": "處理藍牙事件", - "Name": "Bluetooth", - "Name[ar]": "بلوتوث", - "Name[ko]": "블루투스", - "Name[sr@ijekavian]": "Блутут", - "Name[sr]": "Блутут", - "Name[sv]": "Blåtand", - "Name[x-test]": "xxBluetoothxx", - "Name[zh_CN]": "蓝牙", - "Name[zh_TW]": "藍牙", + "Description": "Handles Bluetooth events", + "Description[ar]": "يتعامل مع إجراءات بلوتوث", + "Description[ast]": "Remana eventos Bluetooth", + "Description[ca@valencia]": "Gestiona els esdeveniments del Bluetooth", + "Description[ca]": "Gestiona els esdeveniments del Bluetooth", + "Description[cs]": "Ovládá události Bluetooth", + "Description[da]": "Håndterer Bluetooth-hændelser", + "Description[de]": "Verarbeitung von Bluetooth-Ereignissen", + "Description[el]": "Διαχειρίζεται τα γεγονότα του Bluetooth", + "Description[es]": "Maneja eventos de Bluetooth", + "Description[et]": "Bluetoothi sündmuste käitlemine", + "Description[fi]": "Käsittelee Bluetooth-tapahtumia", + "Description[fr]": "Gère les évènements Bluetooth", + "Description[gl]": "Xestiona acontecementos de Bluetooth", + "Description[it]": "Gestisce gli eventi Bluetooth", + "Description[ko]": "블루투스 이벤트 처리", + "Description[nl]": "Behandelt bluetooth-gebeurtenissen", + "Description[nn]": "Handterer Bluetooth-hendingar", + "Description[pl]": "Obsługuje zdarzenia Bluetooth", + "Description[pt]": "Lida com os eventos do Bluetooth", + "Description[pt_BR]": "Lida com os eventos de Bluetooth", + "Description[ru]": "Обработчик событий Bluetooth", + "Description[sk]": "Spracúva udalosti Bluetooth", + "Description[sl]": "Obravnava dogodke za Bluetooth", + "Description[sr@ijekavian]": "Рукује блутут догађајима", + "Description[sr@ijekavianlatin]": "Rukuje bluetooth događajima", + "Description[sr@latin]": "Rukuje bluetooth događajima", + "Description[sr]": "Рукује блутут догађајима", + "Description[sv]": "Hanterar Blåtandhändelser", + "Description[uk]": "Обробляє події Bluetooth", + "Description[x-test]": "xxHandles Bluetooth eventsxx", + "Description[zh_CN]": "处理蓝牙事件", + "Description[zh_TW]": "處理藍牙事件", + "Name": "Bluetooth", + "Name[ar]": "بلوتوث", + "Name[ko]": "블루투스", + "Name[sr@ijekavian]": "Блутут", + "Name[sr]": "Блутут", + "Name[sv]": "Blåtand", + "Name[x-test]": "xxBluetoothxx", + "Name[zh_CN]": "蓝牙", + "Name[zh_TW]": "藍牙", "ServiceTypes": [ "KDEDModule" ] - }, - "X-KDE-DBus-ModuleName": "bluedevil", - "X-KDE-Kded-autoload": "true", + }, + "X-KDE-DBus-ModuleName": "bluedevil", + "X-KDE-Kded-autoload": "true", "X-KDE-Kded-load-on-demand": "false" } commit 0a3d87673fa872306bc680844ffbd6c05be9659e Author: David Rosca Date: Fri Feb 24 11:45:04 2017 +0100 Add .arcconfig diff --git a/.arcconfig b/.arcconfig new file mode 100644 index 00000000..bc0df43f --- /dev/null +++ b/.arcconfig @@ -0,0 +1,4 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/" +} + commit def41978a6330097ddb191328185fa79a1d63df4 Author: David Rosca Date: Thu Feb 23 15:19:13 2017 +0100 ReceiveFileJob: Don't cancel the request right after accepting it KNotification::closed is emitted also when one of the notification actions was triggered. BUG: 376773 FIXED-IN: 5.8.7 Differential Revision: https://phabricator.kde.org/D4744 diff --git a/src/kded/receivefilejob.cpp b/src/kded/receivefilejob.cpp index 712304ca..8363ca1a 100644 --- a/src/kded/receivefilejob.cpp +++ b/src/kded/receivefilejob.cpp @@ -44,6 +44,7 @@ ReceiveFileJob::ReceiveFileJob(const BluezQt::Request &req, BluezQt::Ob , m_transfer(transfer) , m_session(session) , m_request(req) + , m_accepted(false) { setCapabilities(Killable); } @@ -173,12 +174,13 @@ void ReceiveFileJob::slotAccept() m_tempPath = createTempPath(m_transfer->name()); qCDebug(BLUEDAEMON) << "TempPath" << m_tempPath; + m_accepted = true; m_request.accept(m_tempPath); } void ReceiveFileJob::slotCancel() { - if (m_transfer->status() == BluezQt::ObexTransfer::Queued) { + if (!m_accepted && m_transfer->status() == BluezQt::ObexTransfer::Queued) { qCDebug(BLUEDAEMON) << "Cancel Push"; m_request.reject(); setError(KJob::UserDefinedError); diff --git a/src/kded/receivefilejob.h b/src/kded/receivefilejob.h index fea2ad19..f9fbccc8 100644 --- a/src/kded/receivefilejob.h +++ b/src/kded/receivefilejob.h @@ -66,6 +66,7 @@ private: BluezQt::ObexTransferPtr m_transfer; BluezQt::ObexSessionPtr m_session; BluezQt::Request m_request; + bool m_accepted; }; #endif // RECEIVEFILEJOB_H commit 6048d0d2e2ba883efa4e9c91c17e2c445a9bde03 Author: Jonathan Riddell Date: Tue Feb 21 11:35:33 2017 +0000 Update version number for 5.8.6 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index ab231072..a7cee6bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(bluedevil) -set(PROJECT_VERSION "5.8.5") +set(PROJECT_VERSION "5.8.6") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12) commit 8c8f9c01b5f887a00542a2e5033f1a3dffe205d5 Author: Jonathan Riddell Date: Tue Dec 27 09:17:56 2016 +0000 Update version number for 5.8.5 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index 91c864bb..ab231072 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(bluedevil) -set(PROJECT_VERSION "5.8.4") +set(PROJECT_VERSION "5.8.5") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12) commit 4355a9d41a496a3a3f5c2e00cd2f6d8ebe02ab43 Author: l10n daemon script Date: Sun Dec 18 07:14:53 2016 +0100 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/src/applet/package/metadata.desktop b/src/applet/package/metadata.desktop index e48058d2..c7d20c0e 100644 --- a/src/applet/package/metadata.desktop +++ b/src/applet/package/metadata.desktop @@ -12,6 +12,7 @@ Name[el]=Bluetooth Name[en_GB]=Bluetooth Name[es]=Bluetooth Name[et]=Bluetooth +Name[eu]=Bluetooth Name[fi]=Bluetooth Name[fr]=Bluetooth Name[gl]=Bluetooth @@ -56,6 +57,7 @@ Comment[el]=Κατάσταση και έλεγχος Bluetooth Comment[en_GB]=Bluetooth status and control Comment[es]=Estado y control de Bluetooth Comment[et]=Bluetoothi olek ja juhtimine +Comment[eu]=Bluetooth egoera eta kontrola Comment[fi]=Bluetoothin tila ja hallinta Comment[fr]=État et contrôle du Bluetooth Comment[gl]=Control e estado de Bluetooth diff --git a/src/bluedevil.notifyrc b/src/bluedevil.notifyrc index 54c00340..55898a9d 100644 --- a/src/bluedevil.notifyrc +++ b/src/bluedevil.notifyrc @@ -13,6 +13,7 @@ Comment[el]=Σύστημα Bluetooth Comment[en_GB]=Bluetooth system Comment[es]=Sistema Bluetooth Comment[et]=Bluetoothi süsteem +Comment[eu]=Bluetooth sistema Comment[fi]=Bluetooth-järjestelmä Comment[fr]=Système Bluetooth Comment[gl]=Sistema Bluetooth @@ -58,6 +59,7 @@ Name[el]=Ζητήθηκε εξουσιοδότηση Name[en_GB]=Authorisation Requested Name[es]=Se ha solicitado autorización Name[et]=Autentimine nõudmine +Name[eu]=Baimen-ematea eskatu da Name[fi]=Valtuutusta pyydetty Name[fr]=Autorisation demandée Name[gl]=Requírese autorización @@ -99,6 +101,7 @@ Comment[el]=Μία συσκευή επιθυμεί να συνδεθεί Comment[en_GB]=A device wants to connect Comment[es]=Un dispositivo quiere conectarse Comment[et]=Seade soovib ühendust +Comment[eu]=Gailu batek konektatu nahi du Comment[fi]=Laite haluaa ottaa yhteyden Comment[fr]=Un périphérique veut se connecter Comment[gl]=Un dispositivo quere conectarse @@ -144,6 +147,7 @@ Name[el]=Επιβεβαίωση PIN Name[en_GB]=Confirm PIN Name[es]=Confirmar PIN Name[et]=PIN-i kinnitamine +Name[eu]=Berretsi PIN Name[fi]=Vahvista PIN Name[fr]=Confirmer le code « PIN » Name[gl]=Confirmación do PIN @@ -186,6 +190,7 @@ Comment[el]=Επιβεβαίωση αίτησης συσκευής με χρήσ Comment[en_GB]=Confirm a device request using matching PINs Comment[es]=Confirmar la solicitud de un dispositivo usando un PIN coincidente Comment[et]=Seadme nõude kinnitamine sobivate PIN-idega +Comment[eu]=Berretsi gailu baten eskaera, bat datozen PINak erabiliz 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[gl]=Confirmar a solicitude dun dispositivo empregando PIN coincidentes @@ -231,6 +236,7 @@ Name[el]=Αίτηση PIN Name[en_GB]=Request PIN Name[es]=Solicitar PIN Name[et]=PIN-i soov +Name[eu]=Eskatu PINa Name[fi]=Pyydä PINiä Name[fr]=Demande de code « PIN » Name[gl]=PIN esixido @@ -273,6 +279,7 @@ Comment[el]=Απαιτείται PIN Comment[en_GB]=A PIN is needed Comment[es]=Se necesita un PIN Comment[et]=Vajalik on PIN-i sisestamine +Comment[eu]=PIN bat behar da Comment[fi]=PIN vaaditaan Comment[fr]=Un code « PIN » est nécessaire Comment[gl]=Necesítase un PIN. @@ -320,6 +327,7 @@ Name[el]=Εισερχόμενο αρχείο Name[en_GB]=Incoming File Name[es]=Archivo entrante Name[et]=Sisenev fail +Name[eu]=Sarrerako fitxategia Name[fi]=Saapuva tiedosto Name[fr]=Fichier entrant Name[gl]=Ficheiro entrante @@ -362,6 +370,7 @@ Comment[el]=Μεταφορά εισερχόμενου αρχείου Comment[en_GB]=Incoming file transfer Comment[es]=Transferencia de archivo entrante Comment[et]=Sisenev failiülekanne +Comment[eu]=Sarrerako fitxategi transferentzia Comment[fi]=Saapuva tiedostonsiirto Comment[fr]=Transfert de fichier entrant Comment[gl]=Transferencia de ficheiros entrante @@ -407,6 +416,7 @@ Name[el]=Αποτυχία σύνδεσης Name[en_GB]=Connection Failed Name[es]=La conexión ha fallado Name[et]=Ühendus nurjus +Name[eu]=Konexikoak huts egin du Name[fi]=Yhdistäminen epäonnistui Name[fr]=La connexion a échoué Name[gl]=Non foi posíbel establecer a conexión @@ -447,6 +457,7 @@ Comment[el]=Η σύνδεση με τη συσκευή απέτυχε Comment[en_GB]=Connection to device failed Comment[es]=La conexión con el dispositivo ha fallado Comment[et]=Ühendus seadmega nurjus +Comment[eu]=Gailurako konexioak huts egin du Comment[fi]=Laitteeseen yhdistäminen epäonnistui Comment[fr]=La connexion au périphérique a échoué Comment[gl]=Non foi posíbel establecer a conexión co dispositivo diff --git a/src/fileitemactionplugin/bluedevilfileitemaction.desktop b/src/fileitemactionplugin/bluedevilfileitemaction.desktop index 712f4af2..685cf518 100644 --- a/src/fileitemactionplugin/bluedevilfileitemaction.desktop +++ b/src/fileitemactionplugin/bluedevilfileitemaction.desktop @@ -13,6 +13,7 @@ Name[el]=Αποστολή αρχείου μέσω Bluetooth Name[en_GB]=Send file via Bluetooth Name[es]=Enviar archivo usando Bluetooth Name[et]=Faili saatmine Bluetoothi kaudu +Name[eu]=Bluetooth bidez bidali Name[fi]=Lähetä tiedosto Bluetoothin kautta Name[fr]=Envoi de fichiers via Bluetooth Name[gl]=Enviar o ficheiro por Bluetooth @@ -57,6 +58,7 @@ X-KDE-Submenu[el]=Bluetooth X-KDE-Submenu[en_GB]=Bluetooth X-KDE-Submenu[es]=Bluetooth X-KDE-Submenu[et]=Bluetooth +X-KDE-Submenu[eu]=Bluetooth X-KDE-Submenu[fi]=Bluetooth X-KDE-Submenu[fr]=Bluetooth X-KDE-Submenu[gl]=Bluetooth diff --git a/src/kcmodule/adapters/bluedeviladapters.desktop b/src/kcmodule/adapters/bluedeviladapters.desktop index dca7040f..f0f9666e 100644 --- a/src/kcmodule/adapters/bluedeviladapters.desktop +++ b/src/kcmodule/adapters/bluedeviladapters.desktop @@ -24,6 +24,7 @@ Name[el]=Προσαρμογείς Name[en_GB]=Adapters Name[es]=Adaptadores Name[et]=Adapterid +Name[eu]=Moldagailuak Name[fi]=Sovittimet Name[fr]=Adaptateurs Name[gl]=Adaptadores @@ -67,6 +68,7 @@ Comment[el]=Προσαρμογείς Bluetooth Comment[en_GB]=Bluetooth Adapters Comment[es]=Adaptadores Bluetooth Comment[et]=Bluetoothi adapterid +Comment[eu]=Bluetooth moldagailuak Comment[fi]=Bluetooth-sovittimet Comment[fr]=Adaptateurs Bluetooth Comment[gl]=Adaptadores de Bluetooth @@ -108,6 +110,7 @@ X-KDE-Keywords[el]=Δίκτυο,Συνδεσιμότητα,Bluetooth X-KDE-Keywords[en_GB]=Network,Connectivity,Bluetooth X-KDE-Keywords[es]=Red,Conectividad,Bluetooth X-KDE-Keywords[et]=Võrk,Ühenduvus,Bluetooth +X-KDE-Keywords[eu]=sarea,konektibitatea,Bluetooth X-KDE-Keywords[fi]=Verkko,Yhteydet,Bluetooth X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth X-KDE-Keywords[gl]=Network,Connectivity,Bluetooth,Rede,Conectividade diff --git a/src/kcmodule/devices/bluedevildevices.desktop b/src/kcmodule/devices/bluedevildevices.desktop index 2abd2798..95a78aae 100644 --- a/src/kcmodule/devices/bluedevildevices.desktop +++ b/src/kcmodule/devices/bluedevildevices.desktop @@ -24,6 +24,7 @@ Name[el]=Συσκευές Name[en_GB]=Devices Name[es]=Dispositivos Name[et]=Seadmed +Name[eu]=Gailuak Name[fi]=Laitteet Name[fr]=Périphériques Name[gl]=Dispositivos @@ -68,6 +69,7 @@ Comment[el]=Συσκευές Bluetooth Comment[en_GB]=Bluetooth Devices Comment[es]=Dispositivos Bluetooth Comment[et]=Bluetoothi seadmed +Comment[eu]=Bluetooth gailuak Comment[fi]=Bluetooth-laitteet Comment[fr]=Périphériques Bluetooth Comment[gl]=Dispositivos de Bluetooth @@ -109,6 +111,7 @@ X-KDE-Keywords[el]=Δίκτυο,Συνδεσιμότητα,Bluetooth X-KDE-Keywords[en_GB]=Network,Connectivity,Bluetooth X-KDE-Keywords[es]=Red,Conectividad,Bluetooth X-KDE-Keywords[et]=Võrk,Ühenduvus,Bluetooth +X-KDE-Keywords[eu]=sarea,konektibitatea,Bluetooth X-KDE-Keywords[fi]=Verkko,Yhteydet,Bluetooth X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth X-KDE-Keywords[gl]=Network,Connectivity,Bluetooth,Rede,Conectividade diff --git a/src/kcmodule/global/bluedevilglobal.desktop b/src/kcmodule/global/bluedevilglobal.desktop index 91d3a3a2..af1744a2 100644 --- a/src/kcmodule/global/bluedevilglobal.desktop +++ b/src/kcmodule/global/bluedevilglobal.desktop @@ -23,6 +23,7 @@ Name[el]=Ρυθμίσεις για προχωρημένους Name[en_GB]=Advanced Settings Name[es]=Preferencias avanzadas Name[et]=Muud seadistused +Name[eu]=Ezarpen aurreratuak Name[fi]=Lisäasetukset Name[fr]=Paramètres avancés Name[gl]=Configuración avanzada @@ -63,6 +64,7 @@ Comment[el]=Ρυθμίσεις Bluetooth για προχωρημένους Comment[en_GB]=Advanced Bluetooth Settings Comment[es]=Preferencias avanzadas de Bluetooth Comment[et]=Bluetoothi muud seadistused +Comment[eu]=Bluetooth ezarpen aurreratuak Comment[fi]=Bluetooth-lisäasetukset Comment[fr]=Paramètres Bluetooth avancés Comment[gl]=Configuración avanzada de Bluetooth @@ -104,6 +106,7 @@ X-KDE-Keywords[el]=Δίκτυο,Συνδεσιμότητα,Bluetooth X-KDE-Keywords[en_GB]=Network,Connectivity,Bluetooth X-KDE-Keywords[es]=Red,Conectividad,Bluetooth X-KDE-Keywords[et]=Võrk,Ühenduvus,Bluetooth +X-KDE-Keywords[eu]=sarea,konektibitatea,Bluetooth X-KDE-Keywords[fi]=Verkko,Yhteydet,Bluetooth X-KDE-Keywords[fr]=Réseau, connectivité, Bluetooth X-KDE-Keywords[gl]=Network,Connectivity,Bluetooth,Rede,Conectividade diff --git a/src/kio/bluetooth/bluetooth-network.desktop b/src/kio/bluetooth/bluetooth-network.desktop index db825f17..4c02cc49 100644 --- a/src/kio/bluetooth/bluetooth-network.desktop +++ b/src/kio/bluetooth/bluetooth-network.desktop @@ -13,6 +13,7 @@ Name[el]=Bluetooth Name[en_GB]=Bluetooth Name[es]=Bluetooth Name[et]=Bluetooth +Name[eu]=Bluetooth Name[fi]=Bluetooth Name[fr]=Bluetooth Name[gl]=Bluetooth diff --git a/src/sendfile/org.kde.bluedevilsendfile.desktop b/src/sendfile/org.kde.bluedevilsendfile.desktop index 2e93431f..3b9cc68b 100644 --- a/src/sendfile/org.kde.bluedevilsendfile.desktop +++ b/src/sendfile/org.kde.bluedevilsendfile.desktop @@ -11,6 +11,7 @@ Name[el]=Αποστολή αρχείου μέσω BlueDevil Name[en_GB]=BlueDevil Send File Name[es]=Enviar archivo con BlueDevil Name[et]=BlueDevili faili saatmine +Name[eu]=BlueDevil bidali fitxategia Name[fi]=BlueDevil-tiedostonlähetys Name[fr]=Envoi de fichiers par BlueDevil Name[gl]=Envío de ficheiros por Bluetooth @@ -51,6 +52,7 @@ GenericName[el]=Αποστολή αρχείου μέσω BlueDevil GenericName[en_GB]=BlueDevil Send File GenericName[es]=Enviar archivo con BlueDevil GenericName[et]=BlueDevili faili saatmine +GenericName[eu]=BlueDevil bidali fitxategia GenericName[fi]=BlueDevil-tiedostonlähetys GenericName[fr]=Envoi de fichiers par BlueDevil GenericName[gl]=Envío de ficheiros por Bluetooth @@ -91,6 +93,7 @@ Comment[el]=Αποστολή αρχείου μέσω BlueDevil Comment[en_GB]=BlueDevil Send File Comment[es]=Enviar archivo con BlueDevil Comment[et]=BlueDevili faili saatmine +Comment[eu]=BlueDevil fitxategia bidaltzea Comment[fi]=BlueDevil-tiedostonlähetys Comment[fr]=Envoi de fichiers par BlueDevil Comment[gl]=Envío de ficheiros por Bluetooth diff --git a/src/wizard/org.kde.bluedevilwizard.desktop b/src/wizard/org.kde.bluedevilwizard.desktop index e90c700e..25972616 100644 --- a/src/wizard/org.kde.bluedevilwizard.desktop +++ b/src/wizard/org.kde.bluedevilwizard.desktop @@ -11,6 +11,7 @@ Name[el]=Οδηγός BlueDevil Name[en_GB]=BlueDevil Wizard Name[es]=Asistente de BlueDevil Name[et]=BlueDevili nõustaja +Name[eu]=BlueDevil morroia Name[fi]=Opastettu BlueDevil-toiminto Name[fr]=Assistant pour BlueDevil Name[gl]=Asistente de BlueDevil @@ -52,6 +53,7 @@ GenericName[el]=Οδηγός BlueDevil GenericName[en_GB]=BlueDevil Wizard GenericName[es]=Asistente de BlueDevil GenericName[et]=BlueDevili nõustaja +GenericName[eu]=BlueDevil morroia GenericName[fi]=Opastettu BlueDevil-toiminto GenericName[fr]=Assistant pour BlueDevil GenericName[gl]=Asistente de BlueDevil @@ -94,6 +96,7 @@ Comment[el]=Οδηγός BlueDevil Comment[en_GB]=BlueDevil Wizard Comment[es]=Asistente de BlueDevil Comment[et]=BlueDevili nõustaja +Comment[eu]=BlueDevil morroia Comment[fi]=Opastettu BlueDevil-toiminto Comment[fr]=Assistant pour BlueDevil Comment[gl]=Asistente de BlueDevil commit 632843eeff9cccc010437acd0ea7d428428e1e6b Author: l10n daemon script Date: Wed Dec 14 05:44:28 2016 +0100 GIT_SILENT made messages (after extraction) diff --git a/src/bluedevil-mime.xml b/src/bluedevil-mime.xml index 57fd499b..9ee69426 100644 --- a/src/bluedevil-mime.xml +++ b/src/bluedevil-mime.xml @@ -28,6 +28,7 @@ Notes: Device Dispositivo Seade + Gailua Laite Périphérique Dispositivo @@ -73,6 +74,7 @@ Notes: Service Servicio Teenus + Zerbitzua Palvelu Service Servizo @@ -117,6 +119,7 @@ Notes: Service Servicio Teenus + Zerbitzua Palvelu Service Servizo commit b6a974c5400c2ca082dcef8410042265eee53a2e Author: l10n daemon script Date: Fri Dec 2 05:50:21 2016 +0100 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/src/kded/bluedevil.json b/src/kded/bluedevil.json index d5316023..3f5b7d0f 100644 --- a/src/kded/bluedevil.json +++ b/src/kded/bluedevil.json @@ -49,4 +49,4 @@ "X-KDE-DBus-ModuleName": "bluedevil", "X-KDE-Kded-autoload": "true", "X-KDE-Kded-load-on-demand": "false" -} \ No newline at end of file +} commit 8a9ea32d02b935de43063b5f81466270da066585 Author: l10n daemon script Date: Fri Nov 25 05:52:00 2016 +0100 SVN_SILENT made messages (after extraction) diff --git a/src/bluedevil-mime.xml b/src/bluedevil-mime.xml index 80782fed..57fd499b 100644 --- a/src/bluedevil-mime.xml +++ b/src/bluedevil-mime.xml @@ -29,6 +29,7 @@ Notes: Dispositivo Seade Laite + Périphérique Dispositivo התקן Eszköz