From fb2ea377ac09f02a020781893a9e9cdc487823a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Dec 2016 04:11:39 +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" --- kdecoration/breeze.json | 1 + 1 file changed, 1 insertion(+) diff --git a/kdecoration/breeze.json b/kdecoration/breeze.json index 1b829d56..c2d14338 100644 --- a/kdecoration/breeze.json +++ b/kdecoration/breeze.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Window decoration using the Breeze visual style for the Plasma Desktop", + "Description[ast]": "Decoración de ventanes qu'usa l'estilu visual Breeze pal escritoriu Plasma", "Description[ca@valencia]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori del Plasma", "Description[ca]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori del Plasma", "Description[cs]": "Dekorace oken pro pracovní plochu Plasma využívající styl Breeze",