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
c4a006984c
commit
65b4b9c4ea
1 changed files with 1 additions and 0 deletions
|
@ -97,6 +97,7 @@
|
|||
"Name[tr]": "Büyük Ekran sesle denetim",
|
||||
"Name[uk]": "Голосове керування Bigscreen",
|
||||
"Name[x-test]": "xxBigscreen voice controlxx",
|
||||
"Name[zh_CN]": "Bigscreen 语音控制",
|
||||
"ServiceTypes": [
|
||||
"KdeConnect/Plugin"
|
||||
],
|
||||
|
|
Loading…
Reference in a new issue