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
299d23230c
commit
9040025acd
1 changed files with 1 additions and 0 deletions
|
@ -37,6 +37,7 @@
|
|||
"Name[da]": "virtuel",
|
||||
"Name[de]": "Virtuell",
|
||||
"Name[el]": "εικονικό",
|
||||
"Name[hu]": "virtuális",
|
||||
"Name[nl]": "virtueel",
|
||||
"Name[nn]": "virtuell",
|
||||
"Name[pl]": "wirtualne",
|
||||
|
|
Loading…
Reference in a new issue