mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +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
3038d1acd5
commit
c750820f7c
@ -2,7 +2,7 @@
|
||||
Name=Open with mpv
|
||||
Name[az]=mpv ilə açmaq
|
||||
Name[ca]=Obre amb el «mpv»
|
||||
Name[ca@valencia]=Obri amb el «mpv»
|
||||
Name[ca@valencia]=Obri amb «mpv»
|
||||
Name[cs]=Otevřít pomocí mpv
|
||||
Name[da]=Åbn med mpv
|
||||
Name[de]=Mit mpv öffnen
|
||||
|
Loading…
Reference in New Issue
Block a user