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
7297efe2da
commit
a558641bf6
|
@ -182,6 +182,7 @@ Keywords[pl]=partycja;dysk;
|
|||
Keywords[pt]=partição;disco;
|
||||
Keywords[pt_BR]=partição;disco;
|
||||
Keywords[ru]=раздел;диск;
|
||||
Keywords[sk]=partícia;disk;
|
||||
Keywords[sl]=razdelek;particija;disk;
|
||||
Keywords[sr]=partition;disk;партиција;диск;
|
||||
Keywords[sr@ijekavian]=partition;disk;партиција;диск;
|
||||
|
|
Loading…
Reference in New Issue