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-06-20 07:42:21 +02:00
parent 396a9da557
commit b5040fe425
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

@ -3,6 +3,7 @@ Name=Session Quit
Name[ca]=Sortida de la sessió
Name[cs]=Sezení bylo ukončeno
Name[da]=Afslutning af session
Name[de]=Sitzung beenden
Name[en_GB]=Session Quit
Name[es]=Cierre de sesión
Name[et]=Seansist väljumine