From 7b0d1abdc99ad5378d20cff3f7e0c8b7f01ac455 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 Jan 2018 05:05:01 +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"
---
 linux/applications/org.kde.falkon.desktop | 6 ++++++
 src/lib/data/breeze-fallback/index.theme  | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop
index 089a06349..7703c1c9a 100644
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@@ -11,6 +11,7 @@ Name[es]=Falkon
 Name[fi]=Falkon
 Name[fr]=Falkon
 Name[id]=Falkon
+Name[it]=Falkon
 Name[nl]=Falkon
 Name[pl]=Falkon
 Name[pt]=Falkon
@@ -34,6 +35,7 @@ Comment[es]=Un navegador web rápido y seguro
 Comment[fi]=Nopea ja turvallinen verkkoselain
 Comment[fr]=Un navigateur Web rapide et sécurisé
 Comment[id]=Sebuah penelusur web yang cepat dan aman
+Comment[it]=Un browser we veloce e sicuro
 Comment[nl]=Een snelle en veilige webbrowser
 Comment[pl]=Szybka i bezpieczna przeglądarka sieciowa
 Comment[pt]=Um navegador Web rápido e seguro
@@ -53,6 +55,7 @@ GenericName[es]=Navegador web
 GenericName[fi]=Verkkoselain
 GenericName[fr]=Navigateur Web
 GenericName[id]=Penelusur Web
+GenericName[it]=Browser web
 GenericName[nl]=Webbrowser
 GenericName[pl]=Przeglądarka sieciowa
 GenericName[pt]=Navegador Web
@@ -80,6 +83,7 @@ Name[es]=Abrir nueva pestaña
 Name[fi]=Avaa uusi välilehti
 Name[fr]=Ouvrir un nouvel onglet
 Name[id]=Buka tab baru
+Name[it]=Apri una nuova scheda
 Name[nl]=Nieuw tabblad openen
 Name[pl]=Otwórz nową kartę
 Name[pt]=Abrir uma nova página
@@ -103,6 +107,7 @@ Name[es]=Abrir nueva ventana
 Name[fi]=Avaa uusi ikkuna
 Name[fr]=Ouvrir une nouvelle fenêtre
 Name[id]=Buka jendela baru
+Name[it]=Apre una nuova finestra
 Name[nl]=Nieuw venster openen
 Name[pl]=Otwórz nowe okno
 Name[pt]=Abrir uma nova janela
@@ -125,6 +130,7 @@ Name[es]=Iniciar navegación privada
 Name[fi]=Aloita yksityisselaus
 Name[fr]=Démarrer la navigation privée
 Name[id]=Mulai penelusuran privasi
+Name[it]=Avvia navigazione anonima
 Name[nl]=Privébrowsing starten
 Name[pl]=Rozpocznij prywatne przeglądanie
 Name[pt]=Iniciar a navegação privada
diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme
index 20116da0d..fac6e4596 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -11,6 +11,7 @@ Name[es]=Brisa
 Name[fi]=Breeze
 Name[fr]=Breeze
 Name[id]=Breeze
+Name[it]=Brezza
 Name[nl]=Breeze
 Name[pl]=Bryza
 Name[pt]=Brisa
@@ -31,6 +32,7 @@ Comment[es]=Equipo de Brisa
 Comment[fi]=Breeze-työryhmä
 Comment[fr]=L'équipe de Breeze
 Comment[id]=Tim Breeze
+Comment[it]=La squadra di Brezza
 Comment[nl]=Breeze-team
 Comment[pl]=Zespół Bryzy
 Comment[pt]=Equipa do Brisa