From 8461ec49bfaf1919b6f33862b5a2fb65ec988a6f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 14 Sep 2019 05:25:12 +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"
---
 kcmkwin/kwinoptions/kwinactions.desktop  | 1 +
 kcmkwin/kwinoptions/kwinadvanced.desktop | 2 ++
 kcmkwin/kwinoptions/kwinfocus.desktop    | 1 +
 kcmkwin/kwinoptions/kwinmoving.desktop   | 1 +
 kcmkwin/kwinoptions/kwinoptions.desktop  | 1 +
 5 files changed, 6 insertions(+)

diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index 8035d408ea..fdf0519ca5 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinactions
 
 Name=Window Actions
 Name[ca]=Accions de la finestra
+Name[cs]=Činnosti oken
 Name[es]=Acciones de ventanas
 Name[eu]=Leihoetako ekintzak
 Name[nl]=Vensteracties
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index 9bcc80659a..0bba6a7831 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -10,6 +10,7 @@ X-KDE-PluginKeyword=kwinadvanced
 
 Name=Advanced Window Behavior
 Name[ca]=Comportament avançat de les finestres
+Name[cs]=Pokročilé chování oken
 Name[es]=Comportamiento avanzado de las ventanas
 Name[eu]=Leihoaren portaera aurreratua
 Name[nl]=Geavanceerd venstergedrag
@@ -21,6 +22,7 @@ Name[x-test]=xxAdvanced Window Behaviorxx
 
 Comment=Configure advanced window management options
 Comment[ca]=Configura les opcions avançades per a la gestió de les finestres
+Comment[cs]=Nastavení pokročilých voleb správce oken
 Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas
 Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak
 Comment[nl]=Geavanceerde vensterbeheermogelijkheden configureren
diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop
index d9b6a1812b..6c202c180a 100644
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -10,6 +10,7 @@ X-KDE-PluginKeyword=kwinfocus
 
 Name=Window Focus Behavior
 Name[ca]=Comportament del focus de les finestres
+Name[cs]=Chování při zaměření na okno
 Name[es]=Comportamiento del foco de las ventanas
 Name[eu]=Leiho fokuaren portaera
 Name[nl]=Focusgedrag venster
diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop
index 6849d04bd9..974e8e73e3 100644
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinmoving
 
 Name=Window Movement
 Name[ca]=Moviment de les finestres
+Name[cs]=Pohyb oken
 Name[es]=Movimiento de las ventanas
 Name[eu]=Leihoaren mugimendua
 Name[nl]=Verplaatsen van vensters
diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index 21d6e4105e..e4ebd6b4a1 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -102,6 +102,7 @@ Name[zh_TW]=視窗行為
 
 Comment=Configure window actions and behavior
 Comment[ca]=Configura les accions i comportament de les finestres
+Comment[cs]=Nastavte činností a chování oken
 Comment[es]=Configurar las acciones y el comportamiento de las ventanas
 Comment[eu]=Konfiguratu leihoaren ekintzak eta jokabidea
 Comment[nl]=Vensteracties en gedrag configureren