]> cloud.milkyroute.net Git - dolphin.git/commitdiff
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 15 Jul 2020 03:52:19 +0000 (05:52 +0200)
committerl10n daemon script <scripty@kde.org>
Wed, 15 Jul 2020 03:52:19 +0000 (05:52 +0200)
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

index fd649b54816305d7fc3655f8e6db2cb90e283870..62e8ca04064aba617064194f3421b8f4491bb3fe 100644 (file)
@@ -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