From 7df58d0d04b5e7a1f99c3d35a8fd485bc83e868c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Apr 2019 05:48:13 +0200 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/telephony/kdeconnect_telephony.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 96d831bc3..779d9948c 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -44,6 +44,7 @@ "Description[ca@valencia]": "Mostra les notificacions de les trucades entrants", "Description[ca]": "Mostra les notificacions de les trucades entrants", "Description[en_GB]": "Show notifications for incoming calls", + "Description[es]": "Mostrar notificaciones para llamadas entrantes", "Description[fr]": "Affiche des notifications pour les appels entrants", "Description[gl]": "Mostrar notificacións de chamadas entrantes", "Description[it]": "Mostra le notifiche per le chiamate in ingresso",