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
7ca06a74ae
commit
8baad25d47
|
@ -169,6 +169,7 @@ Keywords[es]=partición;disco;
|
|||
Keywords[id]=partisi;disk;
|
||||
Keywords[it]=partizione;disco;
|
||||
Keywords[nl]=partitie;schijf
|
||||
Keywords[pl]=partycja;dysk;
|
||||
Keywords[pt]=partição;disco;
|
||||
Keywords[sr]=partition;disk;партиција;диск;
|
||||
Keywords[sr@ijekavian]=partition;disk;партиција;диск;
|
||||
|
|
Loading…
Reference in New Issue