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
1671ab99a1
commit
ea0ed96731
1 changed files with 1 additions and 1 deletions
|
@ -115,7 +115,7 @@
|
|||
"Name[sk]": "Veľká obrazovka",
|
||||
"Name[sl]": "Veliki zaslon",
|
||||
"Name[sv]": "Storskärm",
|
||||
"Name[tr]": "Bigscreen",
|
||||
"Name[tr]": "Büyük Ekran",
|
||||
"Name[uk]": "Великий екран",
|
||||
"Name[x-test]": "xxBigscreenxx",
|
||||
"Name[zh_CN]": "大屏幕",
|
||||
|
|
Loading…
Reference in a new issue