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"

indicator/org.kde.kdeconnect.nonplasma.desktop

@@ -39,6 +39,7 @@ Name[sr@ijekavian]=КДЕ‑конекцијин показатељ
 Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj
 Name[sr@latin]=KDE‑konekcijin pokazatelj
 Name[sv]=KDE-anslut indikator
+Name[ta]=கே.டீ.யீ. கனெக்ட் காட்டி
 Name[tr]=KDE Bağlan Göstergesi
 Name[uk]=Індикатор KDE Connect
 Name[x-test]=xxKDE Connect Indicatorxx

plugins/battery/kdeconnect_battery.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/bigscreen/kdeconnect_bigscreen.json

@@ -47,8 +47,10 @@
             }
         ],
         "Description": "Send voice commands to your TV running Plasma Bigscreen",
+        "Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen",
         "Description[ca]": "Envieu ordres de veu al TV executant el Plasma Bigscreen",
         "Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
+        "Description[ia]": "Invia commandos de voce a tu TV executante  Bigscreen de Plasma",
         "Description[ka]": "გაუგზავნეთ თქვენს TV-ზე გაშვებულ Plasma Bigscreen-ს ხმოვანი ბრძანებები",
         "Description[nl]": "Stemcommando s naar uw TV zenden bij actief Plasma Bigscreen",
         "Description[sl]": "Pošljite glasovne ukaze vašemu televizorju, kjer teče Plasma Bigscreen",
@@ -60,6 +62,15 @@
         "Id": "kdeconnect_bigscreen",
         "License": "GPL",
         "Name": "Bigscreen voice control",
+        "Name[ca@valencia]": "Control de veu de Bigscreen",
+        "Name[ca]": "Control de veu de la Bigscreen",
+        "Name[ia]": "Controlo de voce de BigScreen",
+        "Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი",
+        "Name[nl]": "Bigscreen stembesturing",
+        "Name[sl]": "Glasovni nadzor velikega zaslona",
+        "Name[tr]": "Büyük Ekran sesle denetim",
+        "Name[uk]": "Голосове керування Bigscreen",
+        "Name[x-test]": "xxBigscreen voice controlxx",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],

plugins/clipboard/kdeconnect_clipboard.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/kdeconnect.notifyrc

@@ -638,6 +638,7 @@ Name[sr@ijekavian]=Опште обавештење
 Name[sr@ijekavianlatin]=Opšte obaveštenje
 Name[sr@latin]=Opšte obaveštenje
 Name[sv]=Generell underrättelse
+Name[ta]=பொதுவான அறிவிப்பு
 Name[tr]=Genel Bildirim
 Name[uk]=Загальне сповіщення
 Name[x-test]=xxGeneric Notificationxx
@@ -728,6 +729,7 @@ Name[ru]=Удалённая блокировка выполнена успешн
 Name[sk]=Vzdialené uzamknutie úspešné
 Name[sl]=Oddaljeni zaklep uspešen
 Name[sv]=Fjärrlåsning lyckades
+Name[ta]=தொலை பூட்டல் வெற்றியடைந்த‍து
 Name[tr]=Uzaktan Kilit Başarılı
 Name[uk]=Успішне віддалене блокування
 Name[x-test]=xxRemote Lock Successfulxx
@@ -766,6 +768,7 @@ Comment[ru]=Удалённая блокировка выполнена успе
 Comment[sk]=Vzdialené uzamknutie úspešné
 Comment[sl]=Oddaljeni zaklep uspešen
 Comment[sv]=Fjärrlåsning lyckades
+Comment[ta]=தொலை பூட்டல் வெற்றியடைந்த‍து
 Comment[tr]=Uzaktan kilitleme başarılı
 Comment[uk]=Успішне віддалене блокування
 Comment[x-test]=xxRemote lock successfulxx
@@ -807,6 +810,7 @@ Name[ru]=Сбой удалённой блокировки
 Name[sk]=Vzdialené uzamknutie zlyhalo
 Name[sl]=Oddaljeni zaklep ni uspel
 Name[sv]=Fjärrlåsning misslyckades
+Name[ta]=தொலை பூட்டல் தோல்வியடைந்த‍து
 Name[tr]=Uzaktan Kilit Başarısız
 Name[uk]=Помилка під час віддаленого блокування
 Name[x-test]=xxRemote Lock Failurexx
@@ -845,6 +849,7 @@ Comment[ru]=Сбой удалённой блокировки
 Comment[sk]=Vzdialené uzamknutie zlyhalo
 Comment[sl]=Oddaljeni zaklep ni uspel
 Comment[sv]=Fjärrlåsning misslyckades
+Comment[ta]=தொலை பூட்டல் தோல்வியடைந்த‍து
 Comment[tr]=Uzaktan kilitleme başarısız
 Comment[uk]=Помилка під час віддаленого блокування
 Comment[x-test]=xxRemote lock failedxx
@@ -855,19 +860,27 @@ Action=Popup
 [Event/textShareReceived]
 Name=Text Received
 Name[ca]=Text rebut
+Name[ca@valencia]=Text rebut
 Name[en_GB]=Text Received
+Name[fr]=Texte reçu
 Name[gl]=Recibiuse texto
+Name[ia]=Texto Recipite
 Name[nl]=Tekst ontvangen
 Name[sl]=Besedilo prejeto
+Name[ta]=குறுஞ்செய்தி வந்துள்ளது
 Name[tr]=Metin Alındı
 Name[uk]=Отримано текст
 Name[x-test]=xxText Receivedxx
 Comment=Received some text
 Comment[ca]=S'ha rebut text
+Comment[ca@valencia]=S'ha rebut text
 Comment[en_GB]=Received some text
+Comment[fr]=Réception de quelques éléments de texte
 Comment[gl]=Recibiuse un texto
+Comment[ia]=Recipite alcun texto
 Comment[nl]=Enige tekst ontvangen
 Comment[sl]=Prejeto nekaj besedila
+Comment[ta]=குறுஞ்செய்தி வந்துள்ளது
 Comment[tr]=Metin alındı
 Comment[uk]=Отримано якийсь текст
 Comment[x-test]=xxReceived some textxx

plugins/mpriscontrol/kdeconnect_mpriscontrol.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/notifications/kdeconnect_notifications.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/pausemusic/kdeconnect_pausemusic.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/ping/kdeconnect_ping.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/runcommand/kdeconnect_runcommand.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/share/kdeconnect_share.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

plugins/telephony/kdeconnect_telephony.json

@@ -4,8 +4,10 @@
             {
                 "Email": "albertvaka@gmail.com",
                 "Name": "Albert Vaca Cintora",
+                "Name[ca@valencia]": "Albert Vaca Cintora",
                 "Name[ca]": "Albert Vaca Cintora",
                 "Name[en_GB]": "Albert Vaca Cintora",
+                "Name[ia]": "Albert Vaca Cintora",
                 "Name[ka]": "Albert Vaca Cintora",
                 "Name[nl]": "Albert Vaca Cintora",
                 "Name[sl]": "Albert Vaca Cintora",

smsapp/org.kde.kdeconnect.sms.desktop

@@ -120,6 +120,7 @@ Comment[ru]=Мгновенные сообщения
 Comment[sk]=Odosielanie textových správ
 Comment[sl]=Sporočanje besedil
 Comment[sv]=Textmeddelanden
+Comment[ta]=குறுஞ்செய்தி சேவை
 Comment[tr]=SMS İletileri
 Comment[uk]=Обмін текстовими повідомленнями
 Comment[x-test]=xxText Messagingxx