From a5fea98543b5582338bbe38f5fce45e7eadf54c9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Jun 2022 02:44:24 +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 0e148f875..3345af74c 100644 --- a/kcms/colors/accentColorService/accentColorService.json +++ b/kcms/colors/accentColorService/accentColorService.json @@ -12,6 +12,7 @@ "Description[it]": "Applica il colore secondario estratto dallo sfondo su richiesta dbus", "Description[ko]": "D-Bus 요청을 받았을 때 배경 그림에서 추출한 강조색 적용", "Description[nl]": "Past de uitgepakte accentkleur uit achtergrondafbeelding toe op dbus-verzoek", + "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[ro]": "Aplică culoarea de accent extrasă din tapet la cerere dbus", @@ -38,6 +39,7 @@ "Name[ka]": "accentColorService", "Name[ko]": "강조색서비스", "Name[nl]": "accentColorService", + "Name[nn]": "accentColorService", "Name[pl]": "Usługa barwy akcentu", "Name[pt]": "accentColorService", "Name[ro]": "accentColorService",