From b859463f22142ee3e886012aebedfe4c129270a7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 7 Feb 2022 01:45:12 +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/pausemusic/kdeconnect_pausemusic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index fcefb6433..7c0203f70 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -97,8 +97,8 @@ "Name[ar]": "ألبث الوسائط أثناء المكالمات", "Name[ast]": "Posa de la reproducción demientres les llamaes", "Name[az]": "Zəng zamanı media fasiləsi", - "Name[ca@valencia]": "Fa una pausa els suports durant les trucades", - "Name[ca]": "Fa una pausa els suports durant les trucades", + "Name[ca@valencia]": "Pausa als fitxers multimèdia durant les trucades", + "Name[ca]": "Pausa als fitxers multimèdia durant les trucades", "Name[cs]": "Pozastavit média během telefonátu", "Name[da]": "Sæt medier på pause under opkald", "Name[de]": "Medium bei Anrufen anhalten",