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
0ccf773542
commit
7297a41073
@ -82,6 +82,7 @@ Keywords[it]=podcast
|
||||
Keywords[ko]=팟캐스트
|
||||
Keywords[nl]=podcast
|
||||
Keywords[pl]=podkast
|
||||
Keywords[pt]=podcast
|
||||
Keywords[sl]=podcast
|
||||
Keywords[sv]=poddsändning
|
||||
Keywords[tr]=podcast
|
||||
|
Loading…
x
Reference in New Issue
Block a user