From 9ec0d04f4d9b7b3884d99fbf7d76e148c93f3f38 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Apr 2019 06:03:00 +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 eb875d1b8..96d831bc3 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -50,6 +50,7 @@ "Description[nl]": "Meldingen tonen van inkomende oproepen", "Description[nn]": "Vis varsling ved oppringing", "Description[pt]": "Mostrar notificações para as chamadas recebidas", + "Description[pt_BR]": "Mostra notificações para chamadas recebidas", "Description[sv]": "Visa underrättelser om inkommande samtal", "Description[uk]": "Показ сповіщень щодо вхідних дзвінків", "Description[x-test]": "xxShow notifications for incoming callsxx",