mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01: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
3b2a1d6d9b
commit
666fb6664d
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Open with mpv
|
||||
Name[ar]=افتح بواسطة mpv
|
||||
Name[az]=mpv ilə açmaq
|
||||
Name[bg]=Отворяне с mpv
|
||||
Name[ca]=Obre amb el «mpv»
|
||||
|
|
Loading…
Reference in New Issue
Block a user