From 4c7ef0af9d5f8bb8e71a4e10995c68eb1ec0fe0a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 12 Feb 2017 05:41:20 +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"
---
 desktop/org.kde.konsole.desktop | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
index 7b3b1b43..8da09f10 100755
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@@ -263,6 +263,10 @@ Name[ro]=Deschide o fereastră nouă
 Name[ru]=Открыть новое окно
 Name[sk]=Otvoriť nové okno
 Name[sl]=Odpri novo okno
+Name[sr]=Отвори нови прозор
+Name[sr@ijekavian]=Отвори нови прозор
+Name[sr@ijekavianlatin]=Otvori novi prozor
+Name[sr@latin]=Otvori novi prozor
 Name[sv]=Öppna ett nytt fönster
 Name[tr]=Yeni Pencere Aç
 Name[uk]=Відкрити нове вікно
@@ -299,6 +303,10 @@ Name[pt_BR]=Abre uma nova aba
 Name[ru]=Открыть новую вкладку
 Name[sk]=Otvoriť novú kartu
 Name[sl]=Odpri nov zavihek
+Name[sr]=Отвори нови језичак
+Name[sr@ijekavian]=Отвори нови језичак
+Name[sr@ijekavianlatin]=Otvori novi jezičak
+Name[sr@latin]=Otvori novi jezičak
 Name[sv]=Öppna en ny flik
 Name[uk]=Відкрити нову вкладку
 Name[x-test]=xxOpen a New Tabxx