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
69d03099b0
commit
c1ca4a3399
|
@ -181,6 +181,7 @@ Keywords[eu]=partizioa;diskoa;
|
|||
Keywords[fi]=osio;levy;
|
||||
Keywords[fr]=partition;disque;
|
||||
Keywords[gl]=partition;disk;partición;disco;
|
||||
Keywords[hu]=partíció;lemez;
|
||||
Keywords[id]=partisi;disk;
|
||||
Keywords[it]=partizione;disco;
|
||||
Keywords[ko]=partition;disk;파티션;디스크;
|
||||
|
|
Loading…
Reference in New Issue