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 81b93426ed6f2b53f20093c21834d4694eb351d4..c90ef9046ae8d3f318c80348f0ad984d36bb90f8 100644 (file)
--- 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