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
6260c03548
commit
a333b87f74
1 changed files with 1 additions and 0 deletions
|
@ -39,6 +39,7 @@
|
|||
"Description[zh_TW]": "成像到執行中的 Wayland 的巢狀視窗。",
|
||||
"Id": "KWinWaylandWaylandBackend",
|
||||
"Name": "wayland",
|
||||
"Name[ar]": "ويلاند",
|
||||
"Name[az]": "wayland",
|
||||
"Name[ca@valencia]": "Wayland",
|
||||
"Name[ca]": "Wayland",
|
||||
|
|
Loading…
Reference in a new issue