From a32cb1c915960320812e7d1d63fe68ffb729ba37 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 20 Sep 2020 09:20:49 +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"
---
 src/settings/kcm/kcmdolphinnavigation.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 81b93426e..c90ef9046 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -109,7 +109,7 @@ X-DocPath=dolphin/index.html#preferences-dialog-navigation
 Name=Navigation
 Name[ar]=التّنقّل
 Name[ast]=Navegación
-Name[az]=Naviqasiy
+Name[az]=Naviqasiya
 Name[ca]=Navegació
 Name[ca@valencia]=Navegació
 Name[cs]=Navigace
-- 
2.47.3