kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2020-09-20 09:20:49 +02:00
parent 65c2d95a7d
commit a32cb1c915
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/kcm/kcmdolphinnavigation.desktop
View file

@ -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