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
d98bb3cc96
commit
e5a3408f1f
@ -71,6 +71,7 @@ GenericName[zh_CN]=播客应用程序
|
||||
Keywords=podcast
|
||||
Keywords[ca]=podcast
|
||||
Keywords[ca@valencia]=podcast
|
||||
Keywords[en_GB]=podcast
|
||||
Keywords[es]=pódcast
|
||||
Keywords[fr]=podcast
|
||||
Keywords[it]=podcast
|
||||
|
Loading…
Reference in New Issue
Block a user