From: l10n daemon script <scripty@kde.org>
Date: Wed, 15 Jul 2020 03:52:19 +0000 (+0200)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/1995668f8e279209c092287d6b5da5f4bcb4dd9e

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/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index fd649b548..62e8ca040 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -105,7 +105,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