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
c96add9c68
commit
e0dfcb9e1d
|
@ -54,6 +54,7 @@ Actions=icons;details;compact;
|
||||||
|
|
||||||
[Desktop Action icons]
|
[Desktop Action icons]
|
||||||
Name=Icons
|
Name=Icons
|
||||||
|
Name[ast]=Iconos
|
||||||
Name[ca]=Icones
|
Name[ca]=Icones
|
||||||
Name[ca@valencia]=Icones
|
Name[ca@valencia]=Icones
|
||||||
Name[cs]=Ikony
|
Name[cs]=Ikony
|
||||||
|
|
Loading…
Reference in a new issue