From 737a0faee63fa9adeb60598e7d02c1e1c8e05d83 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 14 Sep 2021 02:24:11 +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 a4d81b974..b6d285a24 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -51,7 +51,7 @@ "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]": "Comandament a distància per a 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", "Description[de]": "Fernbedienung für Musik und Videos",