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-10-10 08:56:10 +02:00
parent c2ffcfdc21
commit 43bed9a2a6
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/logout/package/metadata.desktop
View file

@ -29,6 +29,7 @@ Comment=Smoothly fade to the logout screen
Comment[ca]=Transició suau a la pantalla de sortida Comment[ca]=Transició suau a la pantalla de sortida
Comment[ca@valencia]=Transició suau a la pantalla d'eixida Comment[ca@valencia]=Transició suau a la pantalla d'eixida
Comment[cs]=Plynule přejít na odhlašovací obrazovku Comment[cs]=Plynule přejít na odhlašovací obrazovku
Comment[de]=Blendet den Abmeldungsdialog langsam ein.
Comment[en_GB]=Smoothly fade to the logout screen Comment[en_GB]=Smoothly fade to the logout screen
Comment[es]=Desvanecer suavemente hasta la pantalla de cierre de sesión Comment[es]=Desvanecer suavemente hasta la pantalla de cierre de sesión
Comment[eu]=Emeki desagertu saio-ixteko pantailarantz Comment[eu]=Emeki desagertu saio-ixteko pantailarantz