From 2b51b85aa11cde3cd6a958c98b47de5543516dc4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 27 Dec 2016 12:44:11 +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"
---
 kcmkwin/kwincompositing/kwineffect.knsrc       | 6 ++++++
 kcmkwin/kwinscripts/kwinscripts.knsrc          | 6 ++++++
 kcmkwin/kwintabbox/kwinswitcher.knsrc          | 6 ++++++
 plugins/kdecorations/aurorae/src/aurorae.knsrc | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index a8b11b9396..ea8e2124e1 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -1,11 +1,17 @@
 [KNewStuff3]
 Name=Window Manager Effects
 Name[ca]=Efectes del gestor de finestres
+Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
 Name[it]=Effetti del gestore delle finestre
 Name[nl]=Effecten van vensterbeheerder
 Name[pl]=Efekty zarządzania oknami
 Name[pt]=Efeitos do Gestor de Janelas
+Name[sk]=Efekty správcu okien
+Name[sr]=Ефекти менаџера прозора
+Name[sr@ijekavian]=Ефекти менаџера прозора
+Name[sr@ijekavianlatin]=Efekti menadžera prozora
+Name[sr@latin]=Efekti menadžera prozora
 Name[sv]=Fönsterhanteringseffekter
 Name[uk]=Ефекти засобу керування вікнами
 Name[x-test]=xxWindow Manager Effectsxx
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index 851bd89c40..adb0843d62 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -1,11 +1,17 @@
 [KNewStuff3]
 Name=Window Manager Scripts
 Name[ca]=Scripts del gestor de finestres
+Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
 Name[it]=Script del gestore delle finestre
 Name[nl]=Scripts van vensterbeheerder
 Name[pl]=Skrypty zarządzania oknami
 Name[pt]=Programas do Gestor de Janelas
+Name[sk]=Skripty správcu okien
+Name[sr]=Скрипте менаџера прозора
+Name[sr@ijekavian]=Скрипте менаџера прозора
+Name[sr@ijekavianlatin]=Skripte menadžera prozora
+Name[sr@latin]=Skripte menadžera prozora
 Name[sv]=Fönsterhanteringsskript
 Name[uk]=Скрипти засобу керування вікнами
 Name[x-test]=xxWindow Manager Scriptsxx
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 7d5c395907..0cd42e49de 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -1,11 +1,17 @@
 [KNewStuff3]
 Name=Window Manager Switching Layouts
 Name[ca]=Disposicions del commutador del gestor de finestres
+Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
 Name[nl]=Omschakelende indelingen van vensterbeheerder
 Name[pl]=Układ przełączania zarządzana oknami
 Name[pt]=Disposições da Mudança de Janelas do KWin
+Name[sk]=Prepínanie rozložení správcu okien
+Name[sr]=Распореди пребацивања менаџера прозора
+Name[sr@ijekavian]=Распореди пребацивања менаџера прозора
+Name[sr@ijekavianlatin]=Rasporedi prebacivanja menadžera prozora
+Name[sr@latin]=Rasporedi prebacivanja menadžera prozora
 Name[sv]=Fönsterbyteslayouter
 Name[uk]=Компонування засобу перемикання вікон
 Name[x-test]=xxWindow Manager Switching Layoutsxx
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index f8e01c59a7..cdb033d36c 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -1,11 +1,17 @@
 [KNewStuff3]
 Name=Aurorae Window Decorations
 Name[ca]=Decoracions de finestra Aurorae
+Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
 Name[it]=Decorazioni delle finestre Aurorae
 Name[nl]=Aurorea-vensterdecoraties
 Name[pl]=Ozdoby okienne Aurorae
 Name[pt]=Decorações das Janelas do Aurorae
+Name[sk]=Dekorácie okien Aurorae
+Name[sr]=Декорације прозора за Ауроре
+Name[sr@ijekavian]=Декорације прозора за Ауроре
+Name[sr@ijekavianlatin]=Dekoracije prozora za Aurore
+Name[sr@latin]=Dekoracije prozora za Aurore
 Name[sv]=Aurorae-fönsterdekorationer
 Name[uk]=Обрамлення вікон Aurorae
 Name[x-test]=xxAurorae Window Decorationsxx