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
170e4a4880
commit
6808b93f42
@ -123,6 +123,7 @@ Keywords[ko]=팟캐스트
|
|||||||
Keywords[nl]=podcast
|
Keywords[nl]=podcast
|
||||||
Keywords[pl]=podkast
|
Keywords[pl]=podkast
|
||||||
Keywords[pt]=podcast
|
Keywords[pt]=podcast
|
||||||
|
Keywords[pt_BR]=podcast
|
||||||
Keywords[ru]=подкаст
|
Keywords[ru]=подкаст
|
||||||
Keywords[sk]=podcast
|
Keywords[sk]=podcast
|
||||||
Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja
|
Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja
|
||||||
|
Loading…
x
Reference in New Issue
Block a user