mirror of
https://github.com/KDE/kasts.git
synced 2024-12-22 05:36:17 +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
5dd19faed9
commit
42db61d50d
@ -66,6 +66,14 @@ GenericName[uk]=Програма для подкастів
|
||||
GenericName[x-test]=xxPodcast Applicationxx
|
||||
GenericName[zh_CN]=播客应用程序
|
||||
Keywords=podcast
|
||||
Keywords[ca]=podcast
|
||||
Keywords[ca@valencia]=podcast
|
||||
Keywords[es]=pódcast
|
||||
Keywords[fr]=podcast
|
||||
Keywords[nl]=podcast
|
||||
Keywords[sv]=poddsändning
|
||||
Keywords[uk]=трансляція
|
||||
Keywords[x-test]=xxpodcastxx
|
||||
Icon=kasts
|
||||
Exec=kasts
|
||||
Type=Application
|
||||
|
Loading…
Reference in New Issue
Block a user