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 2024-07-12 01:19:11 +00:00
parent de8bd8f126
commit 7891ee6c41
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/fadingpopups/package/metadata.json
View file

@ -102,7 +102,7 @@
"Name[zh_CN]": "气泡显隐渐变动画", "Name[zh_CN]": "气泡显隐渐变动画",
"Name[zh_TW]": "淡化彈出視窗" "Name[zh_TW]": "淡化彈出視窗"
}, },
"X-KDE-Ordering": 60,
"X-KDE-BlocksDirectScanout": false, "X-KDE-BlocksDirectScanout": false,
"X-KDE-Ordering": 60,
"X-Plasma-API": "javascript" "X-Plasma-API": "javascript"
} }