From 6e67932058ff7748f12682dde37b07eac0a163e3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 22 Sep 2022 01:45:45 +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" --- plugins/bigscreen/kdeconnect_bigscreen.json | 2 ++ plugins/lockdevice/kdeconnect_lockdevice.json | 1 + plugins/mousepad/kdeconnect_mousepad.json | 1 + plugins/mprisremote/kdeconnect_mprisremote.json | 1 + plugins/photo/kdeconnect_photo.json | 1 + plugins/ping/kdeconnect_ping.json | 1 + 6 files changed, 7 insertions(+) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index c12a6318e..681807427 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/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", diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json index f64712072..abd3459ce 100644 --- a/plugins/lockdevice/kdeconnect_lockdevice.json +++ b/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į", diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json index 1d1dad80f..60c586cdb 100644 --- a/plugins/mousepad/kdeconnect_mousepad.json +++ b/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]": "가상 입력", diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index 9723ede0b..18595bba4 100644 --- a/plugins/mprisremote/kdeconnect_mprisremote.json +++ b/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", diff --git a/plugins/photo/kdeconnect_photo.json b/plugins/photo/kdeconnect_photo.json index 01b832ab1..d4d463c1b 100644 --- a/plugins/photo/kdeconnect_photo.json +++ b/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ą", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index 4c014204d..e6a47fa05 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/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]": "핑 보내고 받기",