From 32db592309eeb3473d1e7b31fe2ffe0fd2be7947 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 21 Mar 2016 10:58:51 +0000
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"
---
 src/dolphinpart.desktop | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 1f6af812e..830fab2a2 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -87,10 +87,10 @@ Name[ru]=Значки
 Name[se]=Govažat
 Name[sk]=Ikony
 Name[sl]=Ikone
-Name[sr]=Иконе
-Name[sr@ijekavian]=Иконе
-Name[sr@ijekavianlatin]=Ikone
-Name[sr@latin]=Ikone
+Name[sr]=Иконице
+Name[sr@ijekavian]=Иконице
+Name[sr@ijekavianlatin]=Ikonice
+Name[sr@latin]=Ikonice
 Name[sv]=Ikoner
 Name[tr]=Simgeler
 Name[uk]=Піктограми
-- 
2.47.3