mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
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"
This commit is contained in:
parent
65c2d95a7d
commit
a32cb1c915
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue