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"

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 1f6af812ec3ed1306a6dfab972faa272fa547954..830fab2a20d3227e1c9425a635f19799beb4e964 100644 (file)
--- 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[se]=Govažat
 Name[sk]=Ikony
 Name[sl]=Ikone

-Name[sr]=Иконе
-Name[sr@ijekavian]=Иконе
-Name[sr@ijekavianlatin]=Ikone
-Name[sr@latin]=Ikone
+Name[sr]=Ð\98кониÑ\86е
+Name[sr@ijekavian]=Ð\98кониÑ\86е
+Name[sr@ijekavianlatin]=Ikonice
+Name[sr@latin]=Ikonice

 Name[sv]=Ikoner
 Name[tr]=Simgeler
 Name[uk]=Піктограми
 Name[sv]=Ikoner
 Name[tr]=Simgeler
 Name[uk]=Піктограми