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 2019-11-11 05:31:05 +01:00
parent 0789539a9b
commit a6b705bb75
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ Name[ca]=Sortida de la sessió
Name[cs]=Sezení bylo ukončeno
Name[en_GB]=Session Quit
Name[es]=Cierre de sesión
Name[et]=Seansist väljumine
Name[eu]=Saiotik irtetea
Name[gl]=Saída de sesión
Name[it]=Chiusura sessione
@ -22,6 +23,7 @@ Comment=Keep the desktop background alive during logout until the end
Comment[ca]=Manté viu el fons de l'escriptori durant la sortida de la sessió fins el final
Comment[en_GB]=Keep the desktop background alive during logout until the end
Comment[es]=Mantener el fondo del escritorio activo durante el cierre de sesión hasta el final
Comment[et]=Töölaua taust hoitakse väljalogimisel alles kuni lõpuni
Comment[eu]=Eutsi mahaigaineko atzeko-planoa bizirik saio-ixtean bukaera arte
Comment[gl]=Manter vivo o fondo de escritorio durante a saída ata o final
Comment[it]=Mantieni attivo lo sfondo del desktop durante la chiusura della sessione fino alla fine