From 73b2d30b108c90df5e7c23e5fa1f3efed40104ba Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Apr 2018 05:33:09 +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" --- kdecoration/breeze.json | 1 + 1 file changed, 1 insertion(+) diff --git a/kdecoration/breeze.json b/kdecoration/breeze.json index 83386441..ca4a4e36 100644 --- a/kdecoration/breeze.json +++ b/kdecoration/breeze.json @@ -16,6 +16,7 @@ "Description[gl]": "Decoración de xanelas que usa o estilo visual Breeze para o escritorio Plasma.", "Description[hu]": "A Breeze vizuális stílusát használó ablakdekoráció", "Description[ia]": "Decoration de fenestra usante le stylo visual Breeze (Brisa) per le scriptorio de Plasma", + "Description[id]": "Dekorasi jendela menggunakan gaya visual Breeze untuk Desktop Plasma", "Description[it]": "Decorazione per finestre che usa lo stile visuale di Brezza per il desktop Plasma", "Description[ko]": "Plasma 데스크톱의 Breeze 시각 스타일을 사용하는 창 장식", "Description[nl]": "Vensterdecoratie met gebruik van de visuele stijl Breeze voor het Plasma bureaublad",