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
e30540a882
commit
157f22b4c3
|
@ -114,7 +114,7 @@ Keywords[sv]=poddsändning
|
||||||
Keywords[tr]=pod yayını
|
Keywords[tr]=pod yayını
|
||||||
Keywords[uk]=трансляція
|
Keywords[uk]=трансляція
|
||||||
Keywords[x-test]=xxpodcastxx
|
Keywords[x-test]=xxpodcastxx
|
||||||
Keywords[zh_CN]=播客
|
Keywords[zh_CN]=podcast;播客;boke
|
||||||
Icon=kasts
|
Icon=kasts
|
||||||
Exec=kasts
|
Exec=kasts
|
||||||
Type=Application
|
Type=Application
|
||||||
|
|
Loading…
Reference in New Issue