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
ab89460d74
commit
43e1318d52
|
@ -109,6 +109,7 @@ Keywords[ko]=팟캐스트
|
|||
Keywords[nl]=podcast
|
||||
Keywords[pl]=podkast
|
||||
Keywords[pt]=podcast
|
||||
Keywords[sk]=podcast
|
||||
Keywords[sl]=podcast
|
||||
Keywords[sv]=poddsändning
|
||||
Keywords[tr]=pod yayını
|
||||
|
|
Loading…
Reference in New Issue