From 3dc4685561443fab6f50bba19d082a49d1011057 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Sep 2017 04:37:46 +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"
---
 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 e12db5409..d7ff39862 100644
--- a/linux/applications/org.kde.Falkon.desktop
+++ b/linux/applications/org.kde.Falkon.desktop
@@ -2,6 +2,7 @@
 Name=Falkon
 Name[ca]=Falkon
 Name[ca@valencia]=Falkon
+Name[cs]=Falkon
 Name[es]=Falkon
 Name[nl]=Falkon
 Name[pt]=Falkon
@@ -15,6 +16,7 @@ Categories=Network;WebBrowser;
 Comment=A fast and secure web browser
 Comment[ca]=Un navegador web ràpid i segur
 Comment[ca@valencia]=Un navegador web ràpid i segur
+Comment[cs]=Rychlý a bezpečný webový prohlížeč
 Comment[es]=Un navegador web rápido y seguro
 Comment[nl]=Een snelle en veilige webbrowser
 Comment[pt]=Um navegador Web rápido e seguro
@@ -24,6 +26,7 @@ Comment[x-test]=xxA fast and secure web browserxx
 GenericName=Web Browser
 GenericName[ca]=Navegador web
 GenericName[ca@valencia]=Navegador web
+GenericName[cs]=Webový prohlížeč
 GenericName[es]=Navegador web
 GenericName[nl]=Webbrowser
 GenericName[pt]=Navegador Web
@@ -41,6 +44,7 @@ Actions=NewTab;NewWindow;PrivateBrowsing;
 Name=Open new tab
 Name[ca]=Obre una pestanya nova
 Name[ca@valencia]=Obri una pestanya nova
+Name[cs]=Otevřít novou kartu
 Name[es]=Abrir nueva pestaña
 Name[nl]=Nieuw tabblad openen
 Name[pt]=Abrir uma nova página
@@ -54,6 +58,7 @@ Exec=falkon --new-tab
 Name=Open new window
 Name[ca]=Obre una finestra nova
 Name[ca@valencia]=Obri una finestra nova
+Name[cs]=Otevřít nové okno
 Name[es]=Abrir nueva ventana
 Name[nl]=Nieuw venster openen
 Name[pt]=Abrir uma nova janela
@@ -66,6 +71,7 @@ Exec=falkon --new-window
 Name=Start private browsing
 Name[ca]=Inicia la navegació privada
 Name[ca@valencia]=Inicia la navegació privada
+Name[cs]=Začít soukromé prohlížení
 Name[es]=Iniciar navegación privada
 Name[nl]=Privébrowsing starten
 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 509549c68..478c1fa4f 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -2,6 +2,7 @@
 Name=Breeze
 Name[ca]=Brisa
 Name[ca@valencia]=Brisa
+Name[cs]=Breeze
 Name[es]=Brisa
 Name[nl]=Breeze
 Name[pt]=Brisa
@@ -13,6 +14,7 @@ Name[zh_CN]=微风
 Comment=Breeze Team
 Comment[ca]=L'equip Brisa
 Comment[ca@valencia]=L'equip Brisa
+Comment[cs]=Team Breeze
 Comment[es]=Equipo de Brisa
 Comment[nl]=Breeze-team
 Comment[pt]=Equipa do Brisa