From a8ce876a48a464b478ec59ec7c78233d94285d16 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Jun 2022 01:45:01 +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 176a9d9a7..0e148f875 100644 --- a/kcms/colors/accentColorService/accentColorService.json +++ b/kcms/colors/accentColorService/accentColorService.json @@ -8,6 +8,7 @@ "Description[en_GB]": "Applies extracted accent colour from wallpaper on dbus request", "Description[es]": "Aplica el color de acentuación extraído del fondo de pantalla en una petición D-Bus", "Description[fr]": "Applique une couleur accentuée extraite du fonds d'écran à partir d'une requête « D-Bus »", + "Description[id]": "Menerapkan warna aksen yang diekstrak dari wallpaper pada permintaan dbus", "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", @@ -32,6 +33,7 @@ "Name[en_GB]": "accentColorService", "Name[es]": "Servicio de color de acentuación", "Name[fr]": "Service de couleurs accentuées", + "Name[id]": "accentColorService", "Name[it]": "accentColorService", "Name[ka]": "accentColorService", "Name[ko]": "강조색서비스",