mirror of
https://github.com/KDE/kasts.git
synced 2025-01-18 19:41:35 +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
42db61d50d
commit
09395b5bc5
@ -71,6 +71,8 @@ Keywords[ca@valencia]=podcast
|
|||||||
Keywords[es]=pódcast
|
Keywords[es]=pódcast
|
||||||
Keywords[fr]=podcast
|
Keywords[fr]=podcast
|
||||||
Keywords[nl]=podcast
|
Keywords[nl]=podcast
|
||||||
|
Keywords[pl]=podkast
|
||||||
|
Keywords[sl]=podcast
|
||||||
Keywords[sv]=poddsändning
|
Keywords[sv]=poddsändning
|
||||||
Keywords[uk]=трансляція
|
Keywords[uk]=трансляція
|
||||||
Keywords[x-test]=xxpodcastxx
|
Keywords[x-test]=xxpodcastxx
|
||||||
|
Loading…
Reference in New Issue
Block a user