mirror of https://github.com/KDE/kasts.git
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
c8bf67abca
commit
59f8f64230
|
@ -77,6 +77,7 @@ Keywords[cs]=podcast
|
|||
Keywords[de]=Podcast
|
||||
Keywords[en_GB]=podcast
|
||||
Keywords[es]=pódcast
|
||||
Keywords[fi]=podcast
|
||||
Keywords[fr]=podcast
|
||||
Keywords[it]=podcast
|
||||
Keywords[ko]=팟캐스트
|
||||
|
|
Loading…
Reference in New Issue