From 8752e67f8331d888a93c45fa2549b5e0504b0d78 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 26 Aug 2022 01:44:16 +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"
---
 fileitemactionplugin/kdeconnectsendfile.json  |  1 +
 plugins/clipboard/kdeconnect_clipboard.json   |  1 +
 plugins/lockdevice/kdeconnect_lockdevice.json |  1 +
 plugins/pausemusic/kdeconnect_pausemusic.json |  1 +
 .../kdeconnect_remotesystemvolume.json        |  1 +
 .../kdeconnect_virtualmonitor.json            |  1 +
 urlhandler/org.kde.kdeconnect.handler.desktop | 87 ++++++++++---------
 7 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json
index 7bf612fe6..2205dbcaa 100644
--- a/fileitemactionplugin/kdeconnectsendfile.json
+++ b/fileitemactionplugin/kdeconnectsendfile.json
@@ -21,6 +21,7 @@
         "Description[hu]": "Fájl küldése egy másik eszközre a KDE Connecttel",
         "Description[ia]": "Invia file a altere dispositivo usante KDE Connect",
         "Description[id]": "Kirim file ke perangkat lain menggunakan KDE Connect",
+        "Description[is]": "Senda skrár á annað tæki með KDE Connect",
         "Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect",
         "Description[ko]": "KDE Connect로 다른 장치에 파일 보내기",
         "Description[lt]": "Siųsti failą į kitą įrenginį naudojant KDE Connect",
diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json
index 9f467c060..d9dc71ca1 100644
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@ -70,6 +70,7 @@
         "Description[hu]": "A vágólap megosztása az eszközök között",
         "Description[ia]": "Comparti le area de transferentia inter dispositivos",
         "Description[id]": "Berbagi clipboard antara perangkat",
+        "Description[is]": "Deildu klippispjaldinu milli tækja",
         "Description[it]": "Condividi gli appunti tra i dispositivi",
         "Description[ja]": "デバイス間でクリップボードを共有",
         "Description[ko]": "장치간 클립보드 공유",
diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index 870295557..f64712072 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -70,6 +70,7 @@
         "Description[hu]": "Rendszer zárolása",
         "Description[ia]": "Bloca tu systemas",
         "Description[id]": "Menguncikan sistemmu",
+        "Description[is]": "Læsir kerfunum þínum",
         "Description[it]": "Blocca i tuoi sistemi",
         "Description[ko]": "내 시스템 잠그기",
         "Description[lt]": "Užrakina jūsų sistemą",
diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json
index 08e32ed24..baa2408c5 100644
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@@ -117,6 +117,7 @@
         "Name[hu]": "Médialejátszás felfüggesztése",
         "Name[ia]": "Pausa medios durante telephonatas",
         "Name[id]": "Pause media during calls",
+        "Name[is]": "Setja efni í bið á meðan símtölum stendur",
         "Name[it]": "Sospendi i contenuti multimediali durante le chiamate",
         "Name[ja]": "通話中はメディアを一時停止",
         "Name[ko]": "통화 중 미디어 일시 정지",
diff --git a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
index a23d908c5..45b8b8ce8 100644
--- a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
+++ b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
@@ -108,6 +108,7 @@
         "Name[hu]": "Távoli rendszerhangerő",
         "Name[ia]": "Volumine de systema remote",
         "Name[id]": "Remote system volume",
+        "Name[is]": "Hljóðstyrkur fjartengds kerfis",
         "Name[it]": "Volume del sistema remoto",
         "Name[ja]": "リモートシステムの音量",
         "Name[ko]": "원격 시스템 음량",
diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json
index ffc15bd6a..9a8fb88e3 100644
--- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json
+++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json
@@ -86,6 +86,7 @@
         "Name[fr]": "Écran virtuel",
         "Name[ia]": "Monitor virtual",
         "Name[id]": "Monitor Virtual",
+        "Name[is]": "Sýndarskjár",
         "Name[it]": "Schermo virtuale",
         "Name[ko]": "가상 모니터",
         "Name[nl]": "Virtuele monitor",
diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop
index 55ffe98d1..d94e5aaf7 100644
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@@ -1,44 +1,53 @@
 [Desktop Entry]
 Name=KDE Connect
-Name[ar]=معالج عناوين «كدي المتّصل»
-Name[ast]=Remanador d'URLs de KDE Connect
-Name[az]=KDE Connect URL işləyicisi
-Name[bg]=KDE Connect URL манипулатор
-Name[ca]=Gestor d'URL del KDE Connect
-Name[ca@valencia]=Gestor d'URL de KDE Connect
-Name[cs]=Nástroj pro práci s URL v KDE Connect
-Name[da]=URL-håndtering til KDE Connect
-Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen)
-Name[el]=Χειριστής URL του KDE Connect
-Name[en_GB]=KDE Connect URL Handler
-Name[es]=Controlador de URL de KDE Connect
-Name[et]=KDE Connecti URL-ide käitleja
-Name[eu]=KDE Connect-en URL maneiatzailea
-Name[fi]=KDE Connectin verkko-osoitekäsittelijä
-Name[fr]=Gestionnaire d'URL de KDE Connect
-Name[hu]=KDE Connect URL kezelő
-Name[ia]=Gerente de URL de KDE Connect
-Name[id]=Penanganan URL KDE Connect
-Name[it]=Gestore URL di KDE Connect
-Name[ja]=KDE Connect URL ハンドラ
-Name[ko]=KDE Connect URL 처리기
-Name[lt]=KDE Connect URL doroklė
-Name[nl]=URL behandelaar van KDE-Connect
-Name[nn]=KDE Connect adressehandsamar
-Name[pl]=Obsługa adresów URL dla KDE Connect
-Name[pt]=Tratamento de URL's do KDE Connect
-Name[pt_BR]=Tratamento de URLs do KDE Connect
-Name[ro]=Manipulant de URL KDE Connect
-Name[ru]=Обработчик адресов URL в KDE Connect
-Name[sk]=KDE Connect URL Handler
-Name[sl]=Upravitelj naslovov KDE Connect
-Name[sv]=KDE-anslut webbadresshanterare
-Name[ta]=கே.டீ.யீ. கனெக்ட் முகவரி கையாளி
-Name[tr]=KDE Connect URL İşleyicisi
-Name[uk]=Обробник адрес KDE Connect
-Name[x-test]=xxKDE Connect URL Handlerxx
-Name[zh_CN]=KDE Connect URL 处理程序
-Name[zh_TW]=KDE 連線網址處理器
+Name[ar]=كدي المتّصل
+Name[ast]=KDE Connect
+Name[az]=KDE Connect
+Name[bg]=KDE Connect
+Name[bs]=Konekcija KDE
+Name[ca]=KDE Connect
+Name[ca@valencia]=KDE Connect
+Name[cs]=KDE Connect
+Name[da]=KDE Connect
+Name[de]=KDE Connect
+Name[el]=KDE Connect
+Name[en_GB]=KDE Connect
+Name[es]=KDE Connect
+Name[et]=KDE Connect
+Name[eu]=KDE Connect
+Name[fi]=KDE Connect
+Name[fr]=KDE Connect
+Name[gl]=KDE Connect
+Name[he]=KDE Connect
+Name[hu]=KDE Connect
+Name[ia]=KDE Connect
+Name[id]=KDE Connect
+Name[is]=KDE Connect
+Name[it]=KDE Connect
+Name[ja]=KDE Connect
+Name[ko]=KDE Connect
+Name[lt]=KDE Connect
+Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
+Name[nl]=KDE Connect
+Name[nn]=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[sl]=KDE Connect
+Name[sr]=КДЕ‑конекција
+Name[sr@ijekavian]=КДЕ‑конекција
+Name[sr@ijekavianlatin]=KDE‑konekcija
+Name[sr@latin]=KDE‑konekcija
+Name[sv]=KDE-anslut
+Name[ta]=கே.டீ.யீ. கனெக்ட்
+Name[tr]=KDE Connect
+Name[uk]=З’єднання KDE
+Name[x-test]=xxKDE Connectxx
+Name[zh_CN]=KDE Connect
+Name[zh_TW]=KDE 連線
 Exec=kdeconnect-handler %U
 Icon=kdeconnect
 Type=Application