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/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 561ed26e1bb20444f585b264d7405035fcef6094..15d4421ff48f64d2957c764342a8353e22a7667e 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -52,6 +52,7 @@ Name[sr@ijekavianlatin]=Dolphin
 Name[sr@latin]=Dolphin
 Name[sv]=Dolphin
 Name[ta]=டால்பின்
+Name[tok]=ilo ijo Dolphin
 Name[tr]=Dolphin
 Name[uk]=Dolphin
 Name[vi]=Dolphin
@@ -116,6 +117,7 @@ GenericName[sr@ijekavianlatin]=Menadžer fajlova
 GenericName[sr@latin]=Menadžer fajlova
 GenericName[sv]=Filhanterare
 GenericName[ta]=கோப்பு உலாவி
+GenericName[tok]=ilo ijo
 GenericName[tr]=Dosya Yöneticisi
 GenericName[uk]=Менеджер файлів
 GenericName[vi]=Trình quản lí tệp