From f6b81d4bf93613d5583d19305de22eb085b69350 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Sep 2021 02:28:07 +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/mpriscontrol/kdeconnect_mpriscontrol.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index b6d285a24..ceb5f9474 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -50,7 +50,7 @@ "Description[ar]": "تحكّم بالموسيقى والفيديو عن بعد", "Description[ast]": "Control remotu de la música y los vídeos", "Description[az]": "Musiqi və Videoların məsafədən idarə edilməsi", - "Description[ca@valencia]": "Comandament a distància per a la vostra música i vídeos", + "Description[ca@valencia]": "Comandament a distància de la vostra música i vídeos", "Description[ca]": "Comandament a distància de la vostra música i vídeos", "Description[cs]": "Ovládejte vzdáleně vaši hudbu a videa", "Description[da]": "Fjernbetjen din musik og videoer",