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 2aef24cf627211077792891748f581574f5783e4..171b0c2a836b0b5ee1c79e9110d02f84404d0418 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -116,6 +116,11 @@ Terminal=false
 MimeType=inode/directory;
 InitialPreference=10
 Keywords=files;file management;file browsing;samba;network shares;
+Keywords[ca]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa;
+Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;
+Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;
+Keywords[uk]=files;file management;file browsing;samba;network shares;файли;керування файлами;навігація;самба;спільні ресурси;мережа;
+Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;
 X-DBUS-ServiceName=org.kde.dolphin
 X-KDE-Shortcuts=Meta+E
 StartupWMClass=dolphin