yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2021-06-28 01:30:05 +00:00
parent 6260c03548
commit a333b87f74
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/plugins/platforms/wayland/wayland.json
View file

@ -39,6 +39,7 @@
"Description[zh_TW]": "成像到執行中的 Wayland 的巢狀視窗。",
"Id": "KWinWaylandWaylandBackend",
"Name": "wayland",
"Name[ar]": "ويلاند",
"Name[az]": "wayland",
"Name[ca@valencia]": "Wayland",
"Name[ca]": "Wayland",