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 2020-02-16 05:56:41 +01:00
parent 1b528c4020
commit 7cee10d89e
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/sessionquit/package/metadata.desktop
View file

@ -51,6 +51,7 @@ Comment[sv]=Behåll skrivbordets bakgrund levande under utloggning till slutet
Comment[uk]=Не вимикати тло стільниці до кінця процедури виходу із облікового запису
Comment[x-test]=xxKeep the desktop background alive during logout until the endxx
Comment[zh_CN]=注销时保持桌面背景，直到完全退出
Comment[zh_TW]=直到登出完成前皆保留桌面背景圖片
Type=Service
X-KDE-ServiceTypes=KWin/Effect