From 294ad092241327fa795bd2111f2fba53cfa7e20f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 17 Aug 2017 04:50:45 +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"
---
 wallpapers/color/metadata.desktop                  | 1 +
 wallpapers/image/imagepackage/metadata.desktop     | 1 +
 wallpapers/image/slideshowpackage/metadata.desktop | 1 +
 3 files changed, 3 insertions(+)

diff --git a/wallpapers/color/metadata.desktop b/wallpapers/color/metadata.desktop
index b56a5a89e..60ec22d00 100644
--- a/wallpapers/color/metadata.desktop
+++ b/wallpapers/color/metadata.desktop
@@ -54,6 +54,7 @@ Comment=Plain color wallpaper
 Comment[ca]=Fons d'escriptori en color llis
 Comment[ca@valencia]=Fons d'escriptori en color llis
 Comment[es]=Fondo del escritorio de color liso
+Comment[it]=Sfondo con colore semplice
 Comment[nl]=Vlakke kleur achtergrond
 Comment[pt]=Papel de parede de cor simples
 Comment[sk]=Tapeta obyčajná farba
diff --git a/wallpapers/image/imagepackage/metadata.desktop b/wallpapers/image/imagepackage/metadata.desktop
index 78c5cdc8e..9cfba4c42 100644
--- a/wallpapers/image/imagepackage/metadata.desktop
+++ b/wallpapers/image/imagepackage/metadata.desktop
@@ -84,6 +84,7 @@ Comment=Wallpaper view for images
 Comment[ca]=Vista del fons d'escriptori per a les imatges
 Comment[ca@valencia]=Vista del fons d'escriptori per a les imatges
 Comment[es]=Visor de imágenes para el fondo del escritorio
+Comment[it]=Vista delle immagini di sfondo
 Comment[nl]=Achtergrondweergave voor afbeeldingen
 Comment[pt]=Área de imagens do Papel de Parede
 Comment[sk]=Pohľad tapety pre obrázky
diff --git a/wallpapers/image/slideshowpackage/metadata.desktop b/wallpapers/image/slideshowpackage/metadata.desktop
index efed1d279..5dcdd2a6f 100644
--- a/wallpapers/image/slideshowpackage/metadata.desktop
+++ b/wallpapers/image/slideshowpackage/metadata.desktop
@@ -82,6 +82,7 @@ Comment[ca]=Passi de diapositives al fons d'escriptori
 Comment[ca@valencia]=Passe de diapositives al fons d'escriptori
 Comment[cs]=Tapeta s promítáním
 Comment[es]=Fondo de escritorio de presentación
+Comment[it]=Sfondo con presentazione
 Comment[nl]=Achtergrond met diavoorstelling
 Comment[pt]=Papel de parede da apresentação
 Comment[sk]=Tapeta prezentácia