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"

plugins/bigscreen/kdeconnect_bigscreen.json

@@ -62,6 +62,7 @@
         "Description[hu]": "Bigscreen bővítmény",
         "Description[ia]": "Plugin de BigScreen",
         "Description[id]": "Plugin Bigscreen",
+        "Description[is]": "Bigscreen-tengiviðbót",
         "Description[it]": "Estensione Bigscreen",
         "Description[ko]": "큰 화면 플러그인",
         "Description[lt]": "Bigscreen papildinys",
@@ -103,6 +104,7 @@
         "Name[hu]": "Bigscreen",
         "Name[ia]": "Bigscreen (Schermo grande)",
         "Name[id]": "Bigscreen",
+        "Name[is]": "Bigscreen",
         "Name[it]": "Bigscreen",
         "Name[ko]": "큰 화면",
         "Name[lt]": "Bigscreen",

plugins/lockdevice/kdeconnect_lockdevice.json

@@ -117,6 +117,7 @@
         "Name[hu]": "Eszközzárolás",
         "Name[ia]": "Bloca Dispositivo",
         "Name[id]": "LockDevice",
+        "Name[is]": "LockDevice",
         "Name[it]": "Blocco dispositivo",
         "Name[ko]": "장치 잠금",
         "Name[lt]": "Užrakinti įrenginį",

plugins/mousepad/kdeconnect_mousepad.json

@@ -119,6 +119,7 @@
         "Name[hu]": "Virtuális bevitel",
         "Name[ia]": "Entrata virtual",
         "Name[id]": "Virtual input",
+        "Name[is]": "Sýndarílag",
         "Name[it]": "Inserimento virtuale",
         "Name[ja]": "仮想入力",
         "Name[ko]": "가상 입력",

plugins/mprisremote/kdeconnect_mprisremote.json

@@ -116,6 +116,7 @@
         "Name[hu]": "MprisRemote",
         "Name[ia]": "MprisRemote",
         "Name[id]": "MprisRemote",
+        "Name[is]": "MprisRemote",
         "Name[it]": "MprisRemote",
         "Name[ko]": "MprisRemote",
         "Name[lt]": "Mpris pultas",

plugins/photo/kdeconnect_photo.json

@@ -66,6 +66,7 @@
         "Description[hu]": "A csatlakoztatott eszköz használata fénykép készítésére",
         "Description[ia]": "Usa un dispositivo connectite pro prender un photo",
         "Description[id]": "Gunakan peranti yang terkoneksi untuk mengambil foto",
+        "Description[is]": "Nota tengt tæki til að taka mynd",
         "Description[it]": "Usa un dispositivo connesso per scattare una foto",
         "Description[ko]": "연결된 장치로 사진 찍기",
         "Description[lt]": "Naudoti prijungtą įrenginį, siekiant padaryti nuotrauką",

plugins/ping/kdeconnect_ping.json

@@ -70,6 +70,7 @@
         "Description[hu]": "Pingek küldése és fogadása",
         "Description[ia]": "Invia e recipe pings",
         "Description[id]": "Kirim dan terima ping",
+        "Description[is]": "Senda og taka við ping-merkjum",
         "Description[it]": "Invia e ricevi ping",
         "Description[ja]": "Ping を送受信",
         "Description[ko]": "핑 보내고 받기",