From af05d4cb3a7c22ddfdcf4619fef5b20f487f784f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 Feb 2021 07:02:35 +0100 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" --- dataengines/devicenotifications/devicenotifications.notifyrc | 1 + 1 file changed, 1 insertion(+) diff --git a/dataengines/devicenotifications/devicenotifications.notifyrc b/dataengines/devicenotifications/devicenotifications.notifyrc index 4bc8be36a..508432ee7 100644 --- a/dataengines/devicenotifications/devicenotifications.notifyrc +++ b/dataengines/devicenotifications/devicenotifications.notifyrc @@ -85,6 +85,7 @@ Name[it]=Stato dei dispositivi Name[nl]=Apparaatstatus Name[nn]=Einingsstatus Name[pt]=Estado do Dispositivo +Name[pt_BR]=Status do dispositivo Name[ru]=Состояние устройства Name[sl]=Stanje naprave Name[sv]=Enhetsstatus