From 78ee981609dd77346da0df184c30b7916cb24c03 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 1 Oct 2016 12:42:10 +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" --- kdecoration/breeze.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kdecoration/breeze.json b/kdecoration/breeze.json index a5c393c2..c4cb32b2 100644 --- a/kdecoration/breeze.json +++ b/kdecoration/breeze.json @@ -11,6 +11,7 @@ "Description[et]": "Plasma töölaua akende dekoratsioon Breeze'i visuaalse stiiliga", "Description[fi]": "Breeze-tyyliä käyttävä ikkunan kehys Plasma-työpöydälle", "Description[gl]": "Decoración de xanelas que usa o estilo visual Breeze para o escritorio Plasma.", + "Description[it]": "Decorazione per finestre che usa lo stile visuale di Brezza per il desktop Plasma", "Description[nl]": "Vensterdecoratie met gebruik van de visuele stijl Breeze voor het Plasma bureaublad", "Description[nn]": "Vindaugspynt som brukar Breeze-stilen for Plasma-skrivebordet", "Description[pl]": "Wystrój okien przy użyciu stylu wizualnego Bryzy dla Pulpitu Plazmy", @@ -34,6 +35,7 @@ "Name[ca@valencia]": "Brisa", "Name[ca]": "Brisa", "Name[es]": "Brisa", + "Name[it]": "Brezza", "Name[pl]": "Bryza", "Name[pt]": "Brisa", "Name[sk]": "Vánok",