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"

kdeconnect-non-plasma.desktop

@@ -1,5 +1,28 @@
 [Desktop Entry]
 Name=KDE Connect
+Name[bg]=KDE Connect
+Name[bs]=Konekcija KDE
+Name[ca]=KDE Connect
+Name[cs]=KDE Connect
+Name[da]=KDE Connect
+Name[de]=KDE-Connect
+Name[es]=KDE Connect
+Name[fi]=KDE-Connect
+Name[fr]=KDE Connect
+Name[hu]=KDE csatlakozás
+Name[it]=KDE Connect
+Name[ko]=KDE Connect
+Name[nl]=KDE Connect
+Name[pl]=KDE Connect
+Name[pt]=KDE Connect
+Name[pt_BR]=KDE Connect
+Name[ro]=KDE Connect
+Name[ru]=KDE Connect
+Name[sk]=KDE Connect
+Name[sv]=KDE anslut
+Name[tr]=KDE Bağlan
+Name[uk]=З’єднання KDE
+Name[x-test]=xxKDE Connectxx
 Comment=Reach out to your devices
 Exec=plasmawindowed org.kde.kdeconnect --statusnotifier
 Icon=kdeconnect

plugins/kdeconnect.notifyrc

@@ -92,29 +92,6 @@ Action=Popup
 
 [Event/callReceived]
 Name=Incoming Call
-Name[bg]=Позвъняване
-Name[bs]=Poziva se
-Name[ca]=Trucada
-Name[cs]=Volám
-Name[da]=Ringer
-Name[de]=Anruf
-Name[es]=Llamando
-Name[fi]=Soitetaan
-Name[fr]=Appel
-Name[hu]=Hívás
-Name[it]=Chiamata
-Name[ko]=전화 거는 중
-Name[nl]=Oproep
-Name[pl]=Dzwonienie
-Name[pt]=A Chamar
-Name[pt_BR]=Chamando
-Name[ro]=Apelare
-Name[ru]=Вызов
-Name[sk]=Volanie
-Name[sv]=Samtal
-Name[tr]=Aranıyor
-Name[uk]=Виклик
-Name[x-test]=xxCallingxx
 Comment=Someone is calling you
 Comment[bg]=Някой ви се обажда
 Comment[bs]=Neko Vas zove
@@ -143,29 +120,6 @@ Action=Popup
 
 [Event/missedCall]
 Name=Missed Call
-Name[bg]=Пропуснати
-Name[bs]=Propušten
-Name[ca]=Perduda
-Name[cs]=Zmeškané
-Name[da]=Ubesvaret
-Name[de]=Verpasst
-Name[es]=Perdida
-Name[fi]=Ei vastattu
-Name[fr]=Pas de réponse
-Name[hu]=Nem fogadott
-Name[it]=Chiamata persa
-Name[ko]=부재 중 전화
-Name[nl]=Gemist
-Name[pl]=Nie odebrano
-Name[pt]=Não Atendida
-Name[pt_BR]=Não atendidas
-Name[ro]=Nepreluat
-Name[ru]=Пропущен
-Name[sk]=Zmeškané
-Name[sv]=Missat
-Name[tr]=Cevapsız
-Name[uk]=Пропущено
-Name[x-test]=xxMissedxx
 Comment=You have a missed call
 Comment[bg]=Имате неприето обаждане
 Comment[bs]=Imate propušten poziv
@@ -194,29 +148,6 @@ Action=Popup
 
 [Event/smsReceived]
 Name=SMS Received
-Name[bg]=Текстово съобщение
-Name[bs]=SMS
-Name[ca]=SMS
-Name[cs]=SMS
-Name[da]=SMS
-Name[de]=SMS
-Name[es]=SMS
-Name[fi]=Tekstiviesti
-Name[fr]=SMS
-Name[hu]=SMS
-Name[it]=SMS
-Name[ko]=SMS
-Name[nl]=SMS
-Name[pl]=SMS
-Name[pt]=SMS
-Name[pt_BR]=SMS
-Name[ro]=SMS
-Name[ru]=SMS
-Name[sk]=SMS
-Name[sv]=SMS
-Name[tr]=SMS
-Name[uk]=SMS
-Name[x-test]=xxSMSxx
 Comment=Someone sent you an SMS
 Comment[bg]=Някой ви изпрати текстово съобщение
 Comment[bs]=Neko Vam je poslao SMS poruku
@@ -245,29 +176,6 @@ Action=Popup
 
 [Event/batteryLow]
 Name=Battery Low
-Name[bg]=Батерия
-Name[bs]=Baterija
-Name[ca]=Bateria
-Name[cs]=Baterie
-Name[da]=Batteri
-Name[de]=Akku
-Name[es]=Batería
-Name[fi]=Akku
-Name[fr]=Batterie
-Name[hu]=Akkumulátor
-Name[it]=Batteria
-Name[ko]=배터리
-Name[nl]=Batterij
-Name[pl]=Bateria
-Name[pt]=Bateria
-Name[pt_BR]=Bateria
-Name[ro]=Acumulator
-Name[ru]=Батарея
-Name[sk]=Batéria
-Name[sv]=Batteri
-Name[tr]=Pil
-Name[uk]=Акумулятор
-Name[x-test]=xxBatteryxx
 Comment=Your battery is in low state
 Comment[bg]=Батерията ви е с нисък заряд
 Comment[bs]=Vaša baterija je gotovo prazna
@@ -296,29 +204,6 @@ Action=Popup
 
 [Event/pingReceived]
 Name=Ping Received
-Name[bg]=Пинг
-Name[bs]=Ping
-Name[ca]=Ping
-Name[cs]=Ping
-Name[da]=Ping
-Name[de]=Ping
-Name[es]=Ping
-Name[fi]=Tiedustelupaketti
-Name[fr]=Commande « Ping »
-Name[hu]=Ping
-Name[it]=Ping
-Name[ko]=핑
-Name[nl]=Ping
-Name[pl]=Ping
-Name[pt]=Pedido de Rede
-Name[pt_BR]=Ping
-Name[ro]=Ping
-Name[ru]=Пинг
-Name[sk]=Ping
-Name[sv]=Ping
-Name[tr]=Ping
-Name[uk]=Луна
-Name[x-test]=xxPingxx
 Comment=Ping received
 Comment[bg]=Пингът е приет
 Comment[bs]=Primili ste ping
@@ -328,7 +213,7 @@ Comment[da]=Ping modtaget
 Comment[de]=Ping empfangen
 Comment[es]=Ping recibido
 Comment[fi]=Vastaanotettiin tiedustelupaketti
-Comment[fr]=Commande « Ping » reçue
+Comment[fr]=Commande « Ping » reçue
 Comment[hu]=Ping érkezett
 Comment[it]=Hai ricevuto un ping
 Comment[ko]=핑 받음
@@ -347,29 +232,6 @@ Action=Popup
 
 [Event/notification]
 Name=Generic Notification
-Name[bg]=Уведомление
-Name[bs]=Obavještenje
-Name[ca]=Notificació
-Name[cs]=Upozornění
-Name[da]=Bekendtgørelse
-Name[de]=Benachrichtigung
-Name[es]=Notificación
-Name[fi]=Ilmoitus
-Name[fr]=Notification
-Name[hu]=Értesítés
-Name[it]=Notifica
-Name[ko]=알림
-Name[nl]=Melding
-Name[pl]=Powiadomienie
-Name[pt]=Notificação
-Name[pt_BR]=Notificação
-Name[ro]=Notificare
-Name[ru]=Уведомление
-Name[sk]=Upozornenie
-Name[sv]=Underrättelse
-Name[tr]=Bildirim
-Name[uk]=Сповіщення
-Name[x-test]=xxNotificationxx
 Comment=Notification received
 Comment[bg]=Уведомлението е прието
 Comment[bs]=Primjeno obavještenje