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"

1 files changed, 0 insertions, 3 deletions

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index b041e02ac..7f05df766 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -54,7 +54,6 @@ Name[ta]=டால்பின்
 Name[tr]=Dolphin
 Name[uk]=Dolphin
 Name[vi]=Dolphin
-Name[x-test]=xxDolphinxx
 Name[zh_CN]=Dolphin 文件管理器
 Name[zh_TW]=Dolphin
 Exec=dolphin %u
@@ -117,7 +116,6 @@ GenericName[ta]=கோப்பு உலாவி
 GenericName[tr]=Dosya Yöneticisi
 GenericName[uk]=Менеджер файлів
 GenericName[vi]=Trình quản lí tệp
-GenericName[x-test]=xxFile Managerxx
 GenericName[zh_CN]=文件管理器
 GenericName[zh_TW]=檔案管理員
 MimeType=inode/directory;
@@ -165,7 +163,6 @@ Keywords[ta]=files;file management;file browsing;samba;network shares;Explorer;F
 Keywords[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder;
 Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер;
 Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tệp;quản lí tệp;duyệt tệp;chia sẻ mạng;
-Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx;
 Keywords[zh_CN]=files;file management;file browsing;samba;network shares;文件;文件管理;文件浏览;共享;共享文件夹;网络共享;浏览器;访达;查找器;
 Keywords[zh_TW]=files;file management;file browsing;samba;network shares;Explorer;Finder;檔案總管;檔案管理員;檔案;
 X-DBUS-ServiceName=org.kde.dolphin