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-02 05:31:42 +02:00
parent c21d688d73
commit 386d64368d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,18 @@
[Desktop Entry]
Name=Logout
Name[ca]=Sortida
Name[fr]=Déconnexion
Name[nl]=Afmelden
Name[nn]=Logg ut
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[ca]=Transició suau a la pantalla de sortida
Comment[nl]=Langzaam naar het afmeldscherm vervagen
Comment[nn]=Ton ut til utloggingsbiletet
Comment[pt]=Desvanecer suavemente para o ecrã de encerramento
Comment[uk]=Плавний перехід до вікна виходу з системи
Comment[x-test]=xxSmoothly fade to the logout screenxx