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
6bc4f18f60
commit
20cb1492e7
|
@ -104,6 +104,7 @@ Exec=dolphin
|
||||||
[Desktop Action compact]
|
[Desktop Action compact]
|
||||||
Name=Compact
|
Name=Compact
|
||||||
Name[ar]=متراصّ
|
Name[ar]=متراصّ
|
||||||
|
Name[ast]=Compautu
|
||||||
Name[ca]=Compacta
|
Name[ca]=Compacta
|
||||||
Name[ca@valencia]=Compacta
|
Name[ca@valencia]=Compacta
|
||||||
Name[cs]=Kompaktní
|
Name[cs]=Kompaktní
|
||||||
|
|
Loading…
Reference in a new issue