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
c85809b372
commit
72cdc794df
|
@ -183,6 +183,7 @@ Keywords[ko]=partition;disk;파티션;디스크;
|
|||
Keywords[lt]=skaidinys;diskas;
|
||||
Keywords[nl]=partitie;schijf;
|
||||
Keywords[nn]=partisjon;disk;
|
||||
Keywords[pa]=ਪਾਰਟੀਸ਼ਨ;ਡਿਸਕ;
|
||||
Keywords[pl]=partycja;dysk;
|
||||
Keywords[pt]=partição;disco;
|
||||
Keywords[pt_BR]=partição;disco;
|
||||
|
|
Loading…
Reference in New Issue