From fd40b7a37c0e59c0d62d62090719ae38828e5cb3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Mar 2023 01:42:33 +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/lockdevice/kdeconnect_lockdevice.json | 2 +- plugins/mprisremote/kdeconnect_mprisremote.json | 2 +- plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json index fd94736e5..344b2190b 100644 --- a/plugins/lockdevice/kdeconnect_lockdevice.json +++ b/plugins/lockdevice/kdeconnect_lockdevice.json @@ -113,7 +113,7 @@ "Name[et]": "Seadme lukustamine", "Name[eu]": "BlokeatuGailua", "Name[fi]": "Lukitse laite", - "Name[fr]": "LockDevice", + "Name[fr]": "Verrouiller un périphérique", "Name[gl]": "Bloqueo do dispositivo", "Name[hu]": "Eszközzárolás", "Name[ia]": "Bloca Dispositivo", diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index ae70ee101..3a58df908 100644 --- a/plugins/mprisremote/kdeconnect_mprisremote.json +++ b/plugins/mprisremote/kdeconnect_mprisremote.json @@ -113,7 +113,7 @@ "Name[et]": "Kaug-Mpris", "Name[eu]": "MprisRemote", "Name[fi]": "MPRIS-kauko-ohjain", - "Name[fr]": "MprisRemote", + "Name[fr]": "Télécommande « MPris »", "Name[gl]": "MprisRemote", "Name[hu]": "MprisRemote", "Name[ia]": "MprisRemote", diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json index 1bdfe2f77..b55393394 100644 --- a/plugins/remotecontrol/kdeconnect_remotecontrol.json +++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json @@ -113,7 +113,7 @@ "Name[et]": "Kaugjuhtimine", "Name[eu]": "UrrunekoKontrola", "Name[fi]": "Kauko-ohjain", - "Name[fr]": "RemoteControl", + "Name[fr]": "Télécommande", "Name[gl]": "Mando a distancia", "Name[hu]": "Távirányítás", "Name[ia]": "Controlo Remote",