From d1d2677746049261c687f1aef8592ad468afa9fa Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 23 Mar 2015 04:18:37 +0000
Subject: [PATCH] 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"
---
 daemon/kdeconnectd.desktop.cmake |  2 ++
 kdeconnect-non-plasma.desktop    |  2 ++
 plugins/kdeconnect.notifyrc      | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/daemon/kdeconnectd.desktop.cmake b/daemon/kdeconnectd.desktop.cmake
index 093161661..09cc00359 100644
--- a/daemon/kdeconnectd.desktop.cmake
+++ b/daemon/kdeconnectd.desktop.cmake
@@ -8,11 +8,13 @@ OnlyShowIn=KDE;GNOME;Unity;XFCE
 NoDisplay=true
 
 Name=KDEConnect daemon
+Name[ca]=Dimoni del KDEConnect
 Name[de]=KDE-Connect-Dienst
 Name[es]=Demonio de KDE Connect
 Name[nl]=KDEConnect-daemon
 Name[pt]=Servidor do KDE Connect
 Name[pt_BR]=Serviço do KDE Connect
+Name[sk]=KDEConnect démon
 Name[sv]=Demon för KDE-anslut
 Name[uk]=Фонова служба KDEConnect
 Name[x-test]=xxKDEConnect daemonxx
diff --git a/kdeconnect-non-plasma.desktop b/kdeconnect-non-plasma.desktop
index 248a11dfc..185a51b66 100755
--- a/kdeconnect-non-plasma.desktop
+++ b/kdeconnect-non-plasma.desktop
@@ -24,10 +24,12 @@ Name[tr]=KDE Bağlan
 Name[uk]=З’єднання KDE
 Name[x-test]=xxKDE Connectxx
 Comment=Reach out to your devices
+Comment[ca]=Connecteu amb els vostres dispositius
 Comment[es]=Contactar con sus dispositivos
 Comment[nl]=maak verbinding met uw apparaten
 Comment[pt]=Aceda aos seus dispositivos
 Comment[pt_BR]=Acesse seus dispositivos
+Comment[sk]=Oslovenie vašich zariadení
 Comment[sv]=Kontakta dina apparater
 Comment[uk]=З’єднатися з вашими пристроями
 Comment[x-test]=xxReach out to your devicesxx
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 35a71d1f7..67b99c628 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -92,11 +92,13 @@ Action=Popup
 
 [Event/callReceived]
 Name=Incoming Call
+Name[ca]=Trucada entrant
 Name[de]=Eingehender Anruf
 Name[es]=Llamada entrante
 Name[nl]=Inkomende oproep
 Name[pt]=Chamada Recebida
 Name[pt_BR]=Chamada recebida
+Name[sk]=Prichádzajúci hovor
 Name[sv]=Inkommande samtal
 Name[uk]=Вхідний дзвінок
 Name[x-test]=xxIncoming Callxx
@@ -128,11 +130,13 @@ Action=Popup
 
 [Event/missedCall]
 Name=Missed Call
+Name[ca]=Trucada perduda
 Name[de]=Verpasster Anruf
 Name[es]=Llamada perdida
 Name[nl]=Gemiste oproep
 Name[pt]=Chamada Não Atendida
 Name[pt_BR]=Chamada não atendida
+Name[sk]=Zmeškaný hovor
 Name[sv]=Missat samtal
 Name[uk]=Пропущений дзвінок
 Name[x-test]=xxMissed Callxx
@@ -164,11 +168,13 @@ Action=Popup
 
 [Event/smsReceived]
 Name=SMS Received
+Name[ca]=S'ha rebut un SMS
 Name[de]=SMS empfangen
 Name[es]=SMS recibido
 Name[nl]=SMS ontvangen
 Name[pt]=SMS Recebido
 Name[pt_BR]=SMS recebido
+Name[sk]=Prijatá SMS
 Name[sv]=SMS mottaget
 Name[uk]=Отримано SMS
 Name[x-test]=xxSMS Receivedxx
@@ -200,11 +206,13 @@ Action=Popup
 
 [Event/batteryLow]
 Name=Battery Low
+Name[ca]=Bateria baixa
 Name[de]=Akkuladestand niedrig
 Name[es]=Batería baja
 Name[nl]=Batterij op laag niveau
 Name[pt]=Bateria Fraca
 Name[pt_BR]=Bateria fraca
+Name[sk]=Batéria je slabá
 Name[sv]=Dåligt batteri
 Name[uk]=Низький рівень заряду
 Name[x-test]=xxBattery Lowxx
@@ -236,11 +244,13 @@ Action=Popup
 
 [Event/pingReceived]
 Name=Ping Received
+Name[ca]=S'ha rebut un ping
 Name[de]=Ping empfangen
 Name[es]=Ping recibido
 Name[nl]=Ping ontvangen
 Name[pt]=Pedido de Contacto Recebido
 Name[pt_BR]=Ping recebido
+Name[sk]=Prijatý ping
 Name[sv]=Ping mottaget
 Name[uk]=Отримано сигнал підтримки зв’язку
 Name[x-test]=xxPing Receivedxx
@@ -272,11 +282,13 @@ Action=Popup
 
 [Event/notification]
 Name=Generic Notification
+Name[ca]=Notificació genèrica
 Name[de]=Allgemeine Benachrichtigung
 Name[es]=Notificación genérica
 Name[nl]=Algemene melding
 Name[pt]=Notificação Genérica
 Name[pt_BR]=Notificação genérica
+Name[sk]=Všeobecné upozornenie
 Name[sv]=Generell underrättelse
 Name[uk]=Загальне сповіщення
 Name[x-test]=xxGeneric Notificationxx
@@ -308,20 +320,24 @@ Action=Popup
 
 [Event/transferReceived]
 Name=File Transfer
+Name[ca]=Transferència de fitxers
 Name[de]=Dateiübertragung
 Name[es]=Transferencia de archivo
 Name[nl]=Bestandsoverdracht
 Name[pt]=Transferência de Ficheiro
 Name[pt_BR]=Transferência de arquivo
+Name[sk]=Prenos súboru
 Name[sv]=Filöverföring
 Name[uk]=Перенесення файлів
 Name[x-test]=xxFile Transferxx
 Comment=Incoming file
+Comment[ca]=Fitxer entrant
 Comment[de]=Eingehende Datei
 Comment[es]=Archivo entrante
 Comment[nl]=Inkomend bestand
 Comment[pt]=Ficheiro recebido
 Comment[pt_BR]=Arquivo recebido
+Comment[sk]=Prichádzajúci súbor
 Comment[sv]=Inkommande fil
 Comment[uk]=Вхідний файл
 Comment[x-test]=xxIncoming filexx