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 2018-08-01 05:55:06 +02:00
parent 5d279a0ddd
commit c21d688d73
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
effects/logout/package/metadata.desktop
View file

@ -1,7 +1,17 @@
[Desktop Entry]
Name=Logout
Name[nl]=Afmelden
Name[pt]=Encerrar
Name[uk]=Вихід
Name[x-test]=xxLogoutxx
Name[zh_TW]=登出
Icon=preferences-system-windows-effect-logout
Comment=Smoothly fade to the logout screen
Comment[nl]=Langzaam naar het afmeldscherm vervagen
Comment[pt]=Desvanecer suavemente para o ecrã de encerramento
Comment[uk]=Плавний перехід до вікна виходу з системи
Comment[x-test]=xxSmoothly fade to the logout screenxx
Comment[zh_TW]=平順地淡入登出畫面
Type=Service
X-KDE-ServiceTypes=KWin/Effect,KCModule