From 3d56f58bf9df00541d4fc05b670e813b03c4e8b6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 28 Mar 2017 13:54:29 +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/kwincompositing/kwineffect.knsrc                         | 1 +
 kcmkwin/kwinscripts/kwinscripts.knsrc                            | 1 +
 kcmkwin/kwintabbox/kwinswitcher.knsrc                            | 1 +
 packageplugins/scripts/kwin-packagestructure-scripts.desktop     | 1 +
 .../windowswitcher/kwin-packagestructure-windowswitcher.desktop  | 1 +
 plugins/kdecorations/aurorae/src/aurorae.knsrc                   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index eb093ec9f6..0b098fe20e 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -17,6 +17,7 @@ Name[pl]=Efekty zarządzania oknami
 Name[pt]=Efeitos do Gestor de Janelas
 Name[pt_BR]=Efeitos do gerenciador de janelas
 Name[sk]=Efekty správcu okien
+Name[sl]=Učinki upravljalnika oken
 Name[sr]=Ефекти менаџера прозора
 Name[sr@ijekavian]=Ефекти менаџера прозора
 Name[sr@ijekavianlatin]=Efekti menadžera prozora
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index dbe81b7c5f..b4da7071ec 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -18,6 +18,7 @@ Name[pt]=Programas do Gestor de Janelas
 Name[pt_BR]=Scripts do gerenciador de janelas
 Name[ru]=Сценарии для диспетчера окон KWin
 Name[sk]=Skripty správcu okien
+Name[sl]=Skripti upravljalnika oken
 Name[sr]=Скрипте менаџера прозора
 Name[sr@ijekavian]=Скрипте менаџера прозора
 Name[sr@ijekavianlatin]=Skripte menadžera prozora
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 9bc6c0b0a6..65b4c84c43 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -16,6 +16,7 @@ Name[pl]=Układ przełączania zarządzana oknami
 Name[pt]=Disposições da Mudança de Janelas do KWin
 Name[pt_BR]=Layouts de mudança do gerenciador de Janelas
 Name[sk]=Prepínanie rozložení správcu okien
+Name[sl]=Razporedi preklapljanja upravljalnika oken
 Name[sr]=Распореди пребацивања менаџера прозора
 Name[sr@ijekavian]=Распореди пребацивања менаџера прозора
 Name[sr@ijekavianlatin]=Rasporedi prebacivanja menadžera prozora
diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
index 92fc5662ec..31b063c33d 100644
--- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop
+++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
@@ -16,6 +16,7 @@ Name[pl]=Skrypt KWin
 Name[pt]=Programa do KWin
 Name[pt_BR]=Script do KWin
 Name[sk]=KWin skript
+Name[sl]=Skript KWin
 Name[sr]=К‑винова скрипта
 Name[sr@ijekavian]=К‑винова скрипта
 Name[sr@ijekavianlatin]=KWinova skripta
diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
index c4470d35f0..1d00c920e2 100644
--- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
+++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
@@ -16,6 +16,7 @@ Name[pl]=Przełącznik okien KWin
 Name[pt]=Mudança de Janelas do KWin
 Name[pt_BR]=Seletor de janelas do KWin
 Name[sk]=Prepínač okien KWin
+Name[sl]=Preklopnik oken KWin
 Name[sr]=К‑винов мењач прозора
 Name[sr@ijekavian]=К‑винов мењач прозора
 Name[sr@ijekavianlatin]=KWinov menjač prozora
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index e390e6291d..ac04def4ae 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -16,6 +16,7 @@ Name[pl]=Ozdoby okienne Aurorae
 Name[pt]=Decorações das Janelas do Aurorae
 Name[pt_BR]=Decorações de janela Aurorae
 Name[sk]=Dekorácie okien Aurorae
+Name[sl]=Okraski oken Aurorae
 Name[sr]=Декорације прозора за Ауроре
 Name[sr@ijekavian]=Декорације прозора за Ауроре
 Name[sr@ijekavianlatin]=Dekoracije prozora za Aurore