From bc8f3373fd98121fbe230842bbb104889961e6d7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 4 Nov 2015 16:55:32 +0000
Subject: 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"
---
 src/settings/kcm/kcmdolphinservices.desktop | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/settings/kcm/kcmdolphinservices.desktop')

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index a8638dc7f..c8d3cca11 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -1,5 +1,6 @@
 Name=Dolphin Services
 Name[ca]=Serveis del Dolphin
+Name[ca@valencia]=Serveis del Dolphin
 Name[cs]=Služby Dolphinu
 Name[de]=Dolphin-Dienste
 Name[el]=Dolphin Υπηρεσίες
@@ -47,6 +48,7 @@ X-KDE-ParentApp=kcontrol
 X-DocPath=dolphin/index.html#preferences-dialog-services
 Name=Services
 Name[ca]=Serveis
+Name[ca@valencia]=Serveis
 Name[cs]=Služby
 Name[de]=KDE-Dienste
 Name[el]=Υπηρεσίες
@@ -83,6 +85,7 @@ Name[zh_CN]=服务
 Name[zh_TW]=服務
 Comment=Configure file manager services
 Comment[ca]=Configura els serveis del gestor de fitxers
+Comment[ca@valencia]=Configura els serveis del gestor de fitxers
 Comment[cs]=Nastavení služeb správce souborů
 Comment[de]=Dateiverwaltungs-Dienste einrichten
 Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστή αρχείων
@@ -119,6 +122,7 @@ Comment[zh_CN]=配置文件管理器服务
 Comment[zh_TW]=設定檔案管理員服務
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ca]=gestor de fitxers
+X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
 X-KDE-Keywords[de]=Dateiverwaltung
 X-KDE-Keywords[el]=διαχειριστής αρχείων
-- 
cgit v1.3.1