From 3f5f9d09f779305f83cfb3338aeabd51273eba0e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 19 Aug 2017 04:53:24 +0200
Subject: [PATCH] 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"
---
 menu/desktop/kf5-utilities-accessibility.directory | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/menu/desktop/kf5-utilities-accessibility.directory b/menu/desktop/kf5-utilities-accessibility.directory
index e7bdf5960..817d36bc3 100644
--- a/menu/desktop/kf5-utilities-accessibility.directory
+++ b/menu/desktop/kf5-utilities-accessibility.directory
@@ -24,7 +24,7 @@ Name[en_GB]=Accessibility
 Name[eo]=Alirebleco
 Name[es]=Accesibilidad
 Name[et]=Hõlbustus
-Name[eu]=Erabilerraztasuna
+Name[eu]=Irisgarritasuna
 Name[fa]=دستیابی‌پذیری
 Name[fi]=Esteettömyys
 Name[fr]=Accessibilité
@@ -117,7 +117,7 @@ Comment[en_GB]=Accessibility
 Comment[eo]=Alirebleco
 Comment[es]=Accesibilidad
 Comment[et]=Hõlbustus
-Comment[eu]=Erabilerraztasuna
+Comment[eu]=Irisgarritasuna
 Comment[fa]=دستیابی‌پذیری
 Comment[fi]=Esteettömyys
 Comment[fr]=Accessibilité