From 8d9fd0846a476b901f648bc84b20c1d970023a5a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Dec 2015 09:14:26 +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"
---
 examples/developerguide/basic/metadata.desktop      | 2 ++
 templates/cpp-plasmoid/src/package/metadata.desktop | 4 ++++
 templates/qml-plasmoid/package/metadata.desktop     | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop
index ebde9c400..3c11245e2 100644
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@@ -2,10 +2,12 @@
 Comment=Basic App
 Comment[ca]=Aplicació bàsica
 Comment[es]=Aplicación básica
+Comment[it]=Applicazione di base
 Comment[nl]=Basis app
 Comment[pl]=Podstawowa aplikacja
 Comment[pt]=Aplicação Básica
 Comment[pt_BR]=Aplicativo básico
+Comment[sl]=Osnovni program
 Comment[sv]=Enkel applikation
 Comment[uk]=Базова програма
 Comment[x-test]=xxBasic Appxx
diff --git a/templates/cpp-plasmoid/src/package/metadata.desktop b/templates/cpp-plasmoid/src/package/metadata.desktop
index b146ddcee..aef4bed25 100644
--- a/templates/cpp-plasmoid/src/package/metadata.desktop
+++ b/templates/cpp-plasmoid/src/package/metadata.desktop
@@ -6,12 +6,14 @@ Name[da]=%{APPNAME}
 Name[es]=%{APPNAME}
 Name[fi]=%{APPNAME}
 Name[gl]=%{APPNAME}
+Name[it]=%{APPNAME}
 Name[nb]=%{APPNAME}
 Name[nl]=%{APPNAME}
 Name[nn]=%{APPNAME}
 Name[pl]=%{APPNAME}
 Name[pt]=%{APPNAME}
 Name[pt_BR]=%{APPNAME}
+Name[sl]=%{APPNAME}
 Name[sv]=%{APPNAME}
 Name[uk]=%{APPNAME}
 Name[x-test]=xx%{APPNAME}xx
@@ -22,11 +24,13 @@ Comment[da]=nogle få ord om hvad din app gør
 Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
 Comment[gl]=o que fai o seu programa en poucas palabras
+Comment[it]=Cosa fa la tua applicazione in poche parole
 Comment[nb]=hva programmet gjør, med noen få ord
 Comment[nl]=wat uw app doet in een paar woorden
 Comment[pl]=w kilku słowach opis co robi twój program
 Comment[pt]=o que faz a sua aplicação, em poucas palavras
 Comment[pt_BR]=breve descrição do que o seu aplicativo faz
+Comment[sl]=kaj vaš program dela, v nekaj besedah
 Comment[sv]=vad programmet gör med några få ord
 Comment[uk]=призначення вашої програми у декількох словах
 Comment[x-test]=xxwhat your app does in a few wordsxx
diff --git a/templates/qml-plasmoid/package/metadata.desktop b/templates/qml-plasmoid/package/metadata.desktop
index 78ca816b5..b388f7104 100644
--- a/templates/qml-plasmoid/package/metadata.desktop
+++ b/templates/qml-plasmoid/package/metadata.desktop
@@ -6,12 +6,14 @@ Name[da]=%{APPNAME}
 Name[es]=%{APPNAME}
 Name[fi]=%{APPNAME}
 Name[gl]=%{APPNAME}
+Name[it]=%{APPNAME}
 Name[nb]=%{APPNAME}
 Name[nl]=%{APPNAME}
 Name[nn]=%{APPNAME}
 Name[pl]=%{APPNAME}
 Name[pt]=%{APPNAME}
 Name[pt_BR]=%{APPNAME}
+Name[sl]=%{APPNAME}
 Name[sv]=%{APPNAME}
 Name[uk]=%{APPNAME}
 Name[x-test]=xx%{APPNAME}xx
@@ -22,11 +24,13 @@ Comment[da]=nogle få ord om hvad din app gør
 Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
 Comment[gl]=o que fai o seu programa en poucas palabras
+Comment[it]=Cosa fa la tua applicazione in poche parole
 Comment[nb]=hva programmet gjør, med noen få ord
 Comment[nl]=wat uw app doet in een paar woorden
 Comment[pl]=w kilku słowach opis co robi twój program
 Comment[pt]=o que faz a sua aplicação, em poucas palavras
 Comment[pt_BR]=breve descrição do que o seu aplicativo faz
+Comment[sl]=kaj vaš program dela, v nekaj besedah
 Comment[sv]=vad programmet gör med några få ord
 Comment[uk]=призначення вашої програми у декількох словах
 Comment[x-test]=xxwhat your app does in a few wordsxx