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/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index c8d3cca11cae580cd4324720e033458509441b68..e529f16ab98f058d9208f8d394c9c832f541c357 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -47,6 +47,7 @@ X-KDE-PluginKeyword=dolphinservices
 X-KDE-ParentApp=kcontrol
 X-DocPath=dolphin/index.html#preferences-dialog-services
 Name=Services
 X-KDE-ParentApp=kcontrol
 X-DocPath=dolphin/index.html#preferences-dialog-services
 Name=Services

+Name[ast]=Servicios

 Name[ca]=Serveis
 Name[ca@valencia]=Serveis
 Name[cs]=Služby
 Name[ca]=Serveis
 Name[ca@valencia]=Serveis
 Name[cs]=Služby