From 300f491d7f70dd061063267df6b28a99f2012987 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Jun 2022 01:44:14 +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" --- kcms/colors/accentColorService/accentColorService.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kcms/colors/accentColorService/accentColorService.json b/kcms/colors/accentColorService/accentColorService.json index b5678f248..2161b8b35 100644 --- a/kcms/colors/accentColorService/accentColorService.json +++ b/kcms/colors/accentColorService/accentColorService.json @@ -16,6 +16,7 @@ "Description[nn]": "Tek i bruk uthenta kontrastfarge frå bakgrunnsbiletet ved DBus-førespurnad", "Description[pl]": "Stosuje wydobytą barwę akcentu z tapety na żądanie dbus", "Description[pt]": "Aplica a cor acentuada extraída do papel de parede no pedido de DBus", + "Description[pt_BR]": "Aplica a cor de destaque extraída do papel de parede a pedido do DBus", "Description[ro]": "Aplică culoarea de accent extrasă din tapet la cerere dbus", "Description[ru]": "Определение и применение цвета выделения на основании используемых обоев по запросу dbus", "Description[sk]": "Aplikuje extrahovanú farbu akcentu z tapety na požiadavku dbus", @@ -45,6 +46,7 @@ "Name[nn]": "accentColorService", "Name[pl]": "Usługa barwy akcentu", "Name[pt]": "accentColorService", + "Name[pt_BR]": "Serviço de cor de destaque", "Name[ro]": "accentColorService", "Name[ru]": "Служба цвета выделения", "Name[sk]": "accentColorService",