mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +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
c0d5537afb
commit
2d8448f88d
|
@ -59,6 +59,7 @@ Name[ast]=Iconos
|
||||||
Name[ca]=Icones
|
Name[ca]=Icones
|
||||||
Name[ca@valencia]=Icones
|
Name[ca@valencia]=Icones
|
||||||
Name[cs]=Ikony
|
Name[cs]=Ikony
|
||||||
|
Name[da]=Ikoner
|
||||||
Name[de]=Symbole
|
Name[de]=Symbole
|
||||||
Name[el]=Εικονίδια
|
Name[el]=Εικονίδια
|
||||||
Name[en_GB]=Icons
|
Name[en_GB]=Icons
|
||||||
|
|
Loading…
Reference in a new issue