From 94ba6a0978fe03bcd51a37cd252b1ff2a9efe090 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 30 Apr 2018 07:09:04 +0200
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 e6d9e2feb..061493028 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -10,6 +10,7 @@ Name[el]=Dolphin Υπηρεσίες
 Name[en_GB]=Dolphin Services
 Name[es]=Servicios de Dolphin
 Name[et]=Dolphini teenused
+Name[eu]=Dolphin zerbitzuak
 Name[fi]=Dolphin – palvelut
 Name[fr]=Services de Dolphin
 Name[gl]=Servizos de Dolphin
@@ -63,6 +64,7 @@ Name[el]=Υπηρεσίες
 Name[en_GB]=Services
 Name[es]=Servicios
 Name[et]=Teenused
+Name[eu]=Zerbitzuak
 Name[fi]=Palvelut
 Name[fr]=Services
 Name[gl]=Servizos
@@ -105,6 +107,7 @@ Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστ
 Comment[en_GB]=Configure file manager services
 Comment[es]=Configurar los servicios del gestor de archivos
 Comment[et]=Failihalduri teenuste seadistamine
+Comment[eu]=Konfiguratu fitxategi-kudeatzailearen zerbitzuak
 Comment[fi]=Tiedostonhallinnan palveluasetukset
 Comment[fr]=Configuration des services du gestionnaire de fichiers
 Comment[gl]=Configurar servizos de xestores de ficheiros.
@@ -147,6 +150,7 @@ X-KDE-Keywords[el]=διαχειριστής αρχείων
 X-KDE-Keywords[en_GB]=file manager
 X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[et]=failihaldur
+X-KDE-Keywords[eu]=Fitxategi-kudeatzailea
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
-- 
cgit v1.3